log tests/test-resolve @ 11800:88c3ff051270

age author description
Sun, 27 Jun 2010 23:12:05 +0200 Martin Geisler resolve: do not crash on empty mergestate stable
Sun, 26 Apr 2009 14:29:02 +0200 Martin Geisler tests: removed redundant "-d '0 0'" from test scripts
Thu, 25 Dec 2008 10:42:01 +0100 Martin Geisler reset mergestate after commit