Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-rename-merge1.out @ 3233:3fd098e0902d
merge: extend file merge function for renames
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 02 Oct 2006 12:04:48 -0500 |
parents | c82ea81d6850 |
children | c93ce7f10f85 |