Mercurial > hg
log tests/test-resolve.out @ 7952:b214066b7e1d
age | author | description |
---|---|---|
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 |