Mercurial Mercurial > hg-stable / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge2.out
author Matt Mackall <mpm@selenic.com>
Sun, 17 Sep 2006 20:43:06 -0500
changeset 3119 b1de36a4b4df
parent 2175 b2ae81a7df29
child 6336 4b0c9c674707
permissions -rw-r--r--
merge: simplify prompt code

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
hg-stable