Mercurial > hg > gitweb

view tests/test-merge4.out @ 3129:f145d04899d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
extdiff: use the default option only if the default program is used
author TK Soh <teekaysoh@yahoo.com>
date Mon, 18 Sep 2006 12:01:32 +0200
parents b2ae81a7df29
children
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)