Mercurial > hg

view tests/test-merge4.out @ 11452:eac141407b85 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: document how to 'undo' a merge
author Matt Mackall <mpm@selenic.com>
date Sun, 27 Jun 2010 17:41:43 -0500
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)