log tests/test-merge4.t @ 48681:e845537f6adb

age author description
Mon, 16 Nov 2020 16:00:50 -0800 Martin von Zweigbergk errors: use exit code 10 for parse errors
Wed, 29 Jan 2020 11:30:35 -0800 Martin von Zweigbergk revset: add a revset for parents in merge state
Sat, 28 Apr 2012 15:01:57 +0200 Patrick Mezard commit: abort on merge with missing files stable
Thu, 02 Sep 2010 23:22:51 +0200 Martin Geisler tests: remove unneeded -d flags
Wed, 18 Aug 2010 05:12:44 +0530 Pradeepkumar Gayam tests: unify test-merge4 base tests/test-merge4@f33948abf544