Mercurial > hg

view tests/test-merge4.out @ 2460:605e26a2e96e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
report correct mtime in the hg diff output
author andrea@suse.de
date Tue, 20 Jun 2006 15:37:41 +0200
parents b2ae81a7df29
children 4b0c9c674707
line wrap: on
line source

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)