Mercurial > hg
comparison tests/test-merge10.out @ 4884:931f901ab811
merge: fix unnecessary rename merges on linear update (issue631)
If one side's revision is identical to the ancestor, we skip the rest
of the copy detection logic.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 15 Jul 2007 14:43:38 -0500 |
| parents | 59b8f9361545 |
| children | 3d1f9dcecdea |
comparison
equal
deleted
inserted
replaced
| 4883:72ac66e88c43 | 4884:931f901ab811 |
|---|