Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-conflict.out @ 4309:09c5f734ff6a
merge: fix a bug where copies were getting ignored
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 05 Apr 2007 16:25:47 -0500 |
parents | b2ae81a7df29 |
children | 46280c004f22 |