log tests/test-simplemerge-cmd.t @ 14469:2fdea636f254 stable

age author description
Fri, 13 May 2011 19:46:36 -0500 Steve Borho simplemerge: do not allow binary files to abort an entire merge stable
Mon, 08 Nov 2010 01:41:42 +0100 Mads Kiilerich tests: use (esc) instead of other kinds of string escaping stable
Sun, 26 Sep 2010 13:44:49 -0500 Matt Mackall tests: unify test-simplemerge-cmd base tests/test-simplemerge-cmd@1db90441efc3