changeset 12010 | ce818cf215dc |
parent 11988 | 8380ed691df8 |
parent 12008 | fad5ed0ff997 |
child 12045 | 1e8c7999af86 |
--- 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)