Mercurial > hg
diff tests/test-simplemerge-cmd @ 4674:723e0ddb6ada
merge: warn user about divergent renames
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 21 Jun 2007 18:02:03 -0500 |
parents | c6413f8f2f8e |
children | e1f4343db740 |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 21 Jun 2007 18:02:03 -0500 |
parents | c6413f8f2f8e |
children | e1f4343db740 |