Mercurial > hg
diff tests/test-merge-local @ 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 | 46280c004f22 |
children | 4c94b6d0fb1c |