log tests/test-merge-tools.t @ 12886:c25945a148c1 stable

age author description
Tue, 19 Oct 2010 22:33:52 -0500 Steve Borho merge: implement --tool arguments using new ui.forcemerge configurable
Sun, 26 Sep 2010 13:43:21 -0500 Matt Mackall tests: unify test-merge-tools base tests/test-merge-tools@5d73464d7488