log tests/test-merge-default.t @ 21488:feb8ad2d57ee

age author description
Thu, 08 Dec 2011 16:01:44 -0600 Matt Mackall merge with stable
Wed, 07 Dec 2011 11:23:01 -0600 Kevin Bullock merge: make 'nothing to merge' aborts consistent
Thu, 08 Dec 2011 14:32:44 -0600 Matt Mackall branch: warn on branching stable
Thu, 16 Sep 2010 17:51:32 -0500 Matt Mackall tests: add exit codes to unified tests
Sat, 11 Sep 2010 11:44:53 +0200 Adrian Buehlmann tests: unify test-merge-default base tests/test-merge-default@c19ded5428ab