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