equal
deleted
inserted
replaced
32 if not fco.cmp(fcm.data()): # files identical? |
32 if not fco.cmp(fcm.data()): # files identical? |
33 return None |
33 return None |
34 |
34 |
35 fca = fcm.ancestor(fco) |
35 fca = fcm.ancestor(fco) |
36 if not fca: |
36 if not fca: |
37 fca = repo.filectx(fw, fileid=-1) |
37 fca = repo.filectx(fw, fileid=nullrev) |
38 a = repo.wjoin(fw) |
38 a = repo.wjoin(fw) |
39 b = temp("base", fca) |
39 b = temp("base", fca) |
40 c = temp("other", fco) |
40 c = temp("other", fco) |
41 |
41 |
42 if fw != fo: |
42 if fw != fo: |