tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Sun, 20 Aug 2006 22:51:56 -0500
changeset 2973 fb493241d7f6
parent 2175 b2ae81a7df29
permissions -rw-r--r--
Only show long hashes with --debug, not --verbose

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