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