Commit Graph

3 Commits

Author SHA1 Message Date
Matt Mackall
66de5cde16 merge: give a special message for internal:merge failure (issue3105) 2011-11-16 18:04:19 -06:00
Matt Mackall
08439e0f2d tests: add exit codes to unified tests 2010-09-16 17:51:32 -05:00
Adrian Buehlmann
ee5b09a053 tests: unify test-merge-local 2010-09-11 21:19:12 +02:00