tests/test-merge5.out
author Brodie Rao <me+hg@dackz.net>
Sun, 14 Feb 2010 17:08:52 -0500
changeset 10475 2253715fde97
parent 9717 68a1b9d0663e
permissions -rw-r--r--
color: don't crash on invalid status codes (issue2036) If an unknown file with a newline appears in the status output, color shouldn't raise a KeyError trying to parse second line in the filename.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
created new head
% should abort
abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)
% should succeed
1 files updated, 0 files merged, 0 files removed, 0 files unresolved