Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4.out @ 3828:28134d82db9b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add notes about diff/merge asymmetry to export, diff, and log
author Matt Mackall <mpm@selenic.com>
date Fri, 08 Dec 2006 13:04:10 -0600
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)