Mercurial > hg

log tests/test-rename-merge2.out @ 3523:7ed86c28f1ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Sun, 15 Oct 2006 16:18:09 -0500 Matt Mackall merge: if filemerge skips merge, report as updated
Tue, 10 Oct 2006 02:15:20 -0500 Matt Mackall merge: various tidying
Tue, 10 Oct 2006 01:16:06 -0500 Matt Mackall merge: shortcircuit filemerge for identical files
Tue, 10 Oct 2006 00:41:55 -0500 Matt Mackall merge: unify merge and copy actions
Mon, 09 Oct 2006 21:27:04 -0500 Matt Mackall filemerge: use contexts rather than my and other
Sun, 08 Oct 2006 19:57:45 -0500 Matt Mackall merge: remember rename copies and parents properly on commit
Sat, 07 Oct 2006 17:30:26 -0500 Matt Mackall Fix undetected change bug in rename tests
Fri, 06 Oct 2006 17:14:50 -0500 Matt Mackall Update test output
Fri, 06 Oct 2006 16:55:11 -0500 Matt Mackall merge: copy fixes and tests
less more | (0) tip