Mercurial > hg

view tests/test-merge4.out @ 2880:51b8d1ca7820

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make test-diff-subdir executable.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sun, 13 Aug 2006 15:03:48 -0700
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)