Mercurial > hg > mercurial-crew-with-dirclash

log mercurial/merge.py @ 4681:dc5920ea12f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -100 -30 -10 -2 tip
age author description
Fri, 22 Jun 2007 20:44:40 -0300 Alexis S. L. Carvalho merge: fix small bug with a failed merge across a rename
Thu, 21 Jun 2007 18:02:03 -0500 Matt Mackall merge: warn user about divergent renames
less more | (0) -100 -30 -10 -2 tip