log tests/test-merge-commit.out @ 6219:d43c94414ba1

age author description
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall merge: allow smarter tool configuration
Thu, 04 Oct 2007 19:44:37 -0500 Matt Mackall merge: add debug diagnostics for findcopies
Tue, 30 Jan 2007 19:09:08 -0200 Alexis S. L. Carvalho filecommit: don't forget the local parent on a merge with a local rename