log tests/test-merge2.t @ 47949:496a8e383aeb

age author description
Tue, 06 Oct 2020 22:36:15 -0700 Martin von Zweigbergk errors: introduce InputError and use it from commands and cmdutil
Fri, 24 Jan 2020 17:49:21 -0800 Martin von Zweigbergk merge: don't auto-pick destination with `hg merge 'wdir()'`
Mon, 11 Jun 2012 01:40:51 +0200 Mads Kiilerich tests: add missing trailing 'cd ..'
Tue, 19 Apr 2011 12:04:44 +0200 Martin Geisler tests: remove redundant mkdir
Thu, 02 Sep 2010 23:22:51 +0200 Martin Geisler tests: remove unneeded -d flags
Wed, 18 Aug 2010 05:09:58 +0530 Pradeepkumar Gayam tests: unify test-merge2 base tests/test-merge2@1caf9dc9bd10