Mercurial > hg

view tests/test-merge4.out @ 8736:7619b16ea880

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix prompt keep
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -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)