log tests/test-merge-remove.t @ 21812:73e4a02e6d23

age author description
Mon, 10 Feb 2014 00:43:54 +0100 Mads Kiilerich merge: don't overwrite file untracked after remove, abort with 'untracked files' stable
Sun, 12 Sep 2010 12:11:39 +0200 Adrian Buehlmann tests: unify test-merge-remove base tests/test-merge-remove@d4b54bb45926