log mercurial/merge.py @ 4890:931f901ab811

age author description
Sun, 15 Jul 2007 14:43:38 -0500 Matt Mackall merge: fix unnecessary rename merges on linear update (issue631)