Re: feature suggestion: optimize common parts for checkout --conflict=diff3

however the difference isn't that easy to spot any more. I expected

        diff --cc file
        index a07e697,5080129..0000000
        --- a/file
        +++ b/file
        @@@ -12,7 -12,7 +12,12 @@@
          12
          13
          14
        ++<<<<<<< ours
         +15
        ++||||||| base
        ++=======
        + 16
        ++>>>>>>> theirs
          17
          18
          19

This is not correct, it would mean that 12, 13, 14, 17, 18, 19 are in
base, while they are not.

Cheers,
Antoine