Mercurial > public > mercurial-scm > hg

log mercurial/merge.py @ 5909:f45f7390c1c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -100 -30 -10 -3 tip
age author description
Mon, 14 Jan 2008 16:28:32 -0600 Matt Mackall merge: add a bit more sanity to divergent copy checks
Thu, 27 Dec 2007 22:47:44 -0600 Matt Mackall merge: add flag merging intelligence
Thu, 27 Dec 2007 22:27:48 -0600 Matt Mackall merge: use util.set_flags
less more | (0) -100 -30 -10 -3 tip