log tests/test-commit-unresolved.out @ 9939:251812d34c08 stable

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.
Wed, 13 Aug 2008 20:18:40 -0500 Stefano Tortarolo make commit fail when committing unresolved files