log tests/test-resolve.out @ 9639:5384a22ab698

age author description
Thu, 17 Sep 2009 22:39:38 -0700 Stuart W Marks hg: say 'hg update' instead of 'hg up' in merge status message
Wed, 04 Mar 2009 13:06:16 -0600 Augie Fackler merge: better error messages to lead users to hg update --clean to abandon merges.
Thu, 25 Dec 2008 10:42:01 +0100 Martin Geisler reset mergestate after commit