tests/test-merge4.out
author Brodie Rao <me+hg@dackz.net>
Wed, 26 Nov 2008 08:58:31 -0500
changeset 7455 c9fd5474a707
parent 6336 4b0c9c674707
permissions -rw-r--r--
color: add --color switch --color works like GNU grep --color. --color=auto only colorizes output for non-dumb terminals that are TTYs.

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)