Mercurial > hg
view tests/test-merge4.out @ 2894:f28f4c850cd8
merge: hoist some working manifest logic out of merge loop
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 15 Aug 2006 16:27:19 -0500 |
parents | b2ae81a7df29 |
children | 4b0c9c674707 |
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)