Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge6 @ 3785:1427949b8f80
imported patch folding
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 04 Dec 2006 17:10:29 -0600 |
parents | ad3d5b4367cb |
children | a74586023196 |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 04 Dec 2006 17:10:29 -0600 |
parents | ad3d5b4367cb |
children | a74586023196 |