Mercurial > hg > mercurial-crew-with-dirclash

log mercurial/merge.py @ 3407:d2b55e3c4e25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -30 -10 -3 tip
age author description
Sun, 15 Oct 2006 16:18:09 -0500 Matt Mackall merge: if filemerge skips merge, report as updated
Fri, 13 Oct 2006 17:58:04 -0500 Matt Mackall merge: update dirstate correctly for non-branchmerge updates
Thu, 12 Oct 2006 14:49:19 -0500 Matt Mackall merge: turn followcopies on by default
less more | (0) -30 -10 -3 tip