equal
deleted
inserted
replaced
441 needed[p] -= 1 |
441 needed[p] -= 1 |
442 if not needed[p]: |
442 if not needed[p]: |
443 del hist[p] |
443 del hist[p] |
444 hist[f] = curr |
444 hist[f] = curr |
445 |
445 |
446 return zip(hist[f][0], hist[f][1].splitlines(1)) |
446 return zip(hist[f][0], hist[f][1].splitlines(True)) |
447 |
447 |
448 def ancestor(self, fc2): |
448 def ancestor(self, fc2): |
449 """ |
449 """ |
450 find the common ancestor file context, if any, of self, and fc2 |
450 find the common ancestor file context, if any, of self, and fc2 |
451 """ |
451 """ |