Mercurial > hg

view tests/test-merge4.out @ 8012:8c5f1b28e0bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: use unified diff in test-command-template for better error reports
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Mon, 06 Apr 2009 10:53:01 +0200
parents 4b0c9c674707
children
line wrap: on
line source

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)