log tests/test-merge-force.t @ 24880:5e111acc1170 stable

age author description
Thu, 17 Apr 2014 22:47:38 +0200 Mads Kiilerich spelling: fixes from proofreading of spell checker issues
Wed, 26 Nov 2014 11:45:21 -0800 Martin von Zweigbergk merge: add more thorough tests for --force
Mon, 23 Sep 2013 20:50:51 -0700 Siddharth Agarwal merge: standardize error message for dirty working dir
Wed, 07 Dec 2011 11:23:01 -0600 Kevin Bullock merge: make 'nothing to merge' aborts consistent
Thu, 16 Sep 2010 17:51:32 -0500 Matt Mackall tests: add exit codes to unified tests
Sat, 11 Sep 2010 17:58:37 +0200 Adrian Buehlmann tests: unify test-merge-force base tests/test-merge-force@cfa3c35fec91