Mercurial > hg
diff tests/test-merge8.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 | bb1800a7d7e1 |
children | 0750f11152fe |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 21 Jun 2007 18:02:03 -0500 |
parents | bb1800a7d7e1 |
children | 0750f11152fe |