mercurial/filemerge.py
changeset 11702 eb07fbc21e9c
parent 11149 d3c1eddfdbcf
child 11988 8380ed691df8
equal deleted inserted replaced
11701:84fb29f5e0d2 11702:eb07fbc21e9c
   133         try:
   133         try:
   134             return util.binary(ctx.data())
   134             return util.binary(ctx.data())
   135         except IOError:
   135         except IOError:
   136             return False
   136             return False
   137 
   137 
   138     if not fco.cmp(fcd.data()): # files identical?
   138     if not fco.cmp(fcd): # files identical?
   139         return None
   139         return None
   140 
   140 
   141     if fca == fco: # backwards, use working dir parent as ancestor
   141     if fca == fco: # backwards, use working dir parent as ancestor
   142         fca = fcd.parents()[0]
   142         fca = fcd.parents()[0]
   143 
   143