Mercurial > hg

diff mercurial/filemerge.py @ 12008:fad5ed0ff997 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: move reverse-merge logic out of filemerge (issue2342)
author Matt Mackall <mpm@selenic.com>
date Sat, 21 Aug 2010 10:41:29 -0500
parents d3c1eddfdbcf
children ce818cf215dc 8e7960feb139
line wrap: on
line diff
--- a/mercurial/filemerge.py	Fri Aug 20 17:16:37 2010 -0500
+++ b/mercurial/filemerge.py	Sat Aug 21 10:41:29 2010 -0500
@@ -138,9 +138,6 @@
     if not fco.cmp(fcd.data()): # 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)