Mercurial > hg
diff tests/test-merge7.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 | 93a4e72b4f83 |
children | 17ed9b9a0d03 |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 21 Jun 2007 18:02:03 -0500 |
parents | 93a4e72b4f83 |
children | 17ed9b9a0d03 |