view hg @ 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.

#!/usr/bin/env python
#
# mercurial - scalable distributed SCM
#
# Copyright 2005-2007 Matt Mackall <[e-mail]>
#
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.

import mercurial.commands
mercurial.commands.run()