log tests/test-merge-tools.t @ 15481:0b7ce2f739fb

age author description
Wed, 12 Oct 2011 21:45:58 -0400 Greg Ward merge: expand environment variables and ~/ in tool.executable
Thu, 13 Oct 2011 04:27:49 +0200 Mads Kiilerich tests: cleanup of echo statements left over from test conversion
Fri, 18 Feb 2011 03:35:01 +0100 Mads Kiilerich util: flush stdout before calling external processes stable
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