Mercurial > hg-stable

diff mercurial/filemerge.py @ 12010:ce818cf215dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Sat, 21 Aug 2010 10:48:49 -0500
parents 8380ed691df8 fad5ed0ff997
children 1e8c7999af86
line wrap: on
line diff
--- a/mercurial/filemerge.py	Fri Aug 20 21:28:14 2010 -0500
+++ b/mercurial/filemerge.py	Sat Aug 21 10:48:49 2010 -0500
@@ -138,9 +138,6 @@
     if not fco.cmp(fcd): # files identical?
         return None
 
-    if fca == fco: # backwards, use working dir parent as ancestor
-        fca = fcd.parents()[0]
-
     ui = repo.ui
     fd = fcd.path()
     binary = isbin(fcd) or isbin(fco) or isbin(fca)