log tests/test-merge-local.t @ 19091:f01a351db791 stable

age author description
Wed, 16 Nov 2011 18:04:19 -0600 Matt Mackall merge: give a special message for internal:merge failure (issue3105)
Thu, 16 Sep 2010 17:51:32 -0500 Matt Mackall tests: add exit codes to unified tests
Sat, 11 Sep 2010 21:19:12 +0200 Adrian Buehlmann tests: unify test-merge-local base tests/test-merge-local@dc6270a9c384