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