Mercurial > hg
view tests/test-merge2.out @ 5973:ea77f6f77514
patchbomb: undo backout and fix bugs in the earlier patch
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 31 Jan 2008 14:44:19 -0600 |
parents | b2ae81a7df29 |
children | 4b0c9c674707 |
line wrap: on
line source
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