🚀 Is there anything to properly preview git's combined diff output ?

[akharrou]

Thank you for this amazing diff render I really love it and use it ALL the time

Currently, with my configurations at least, the "combined diff" output that git produces for unmerged files is interpreted like any other regular diff output.

# combined diff example (currently have files in an unmerged state)
$ git diff
diff --cc file.txt
index 1191247,e2709b3..0000000
--- i/file.txt
+++ w/file.txt
@@@ -1,2 -1,2 +1,7 @@@
  1
++<<<<<<< .merge_file_ehjgho
 +2
++||||||| .merge_file_r2aEcC
++=======
+ 102
++>>>>>>> .merge_file_VIgoDD

Lines with:

• " ": are already present on both "ours" and "theirs" copy
• "+ ": are additions to "ours"
• " +": are additions to "theirs"
• "++": are additions to both "ours" and "theirs"
• ... ditto for subtractions

Currently I get this delta output for combined diffs:

It's not wrong, you can still interpret the first column yourself. my question is: is there currently a way of interpreting combined diffs ? otherwise my feature suggestion would be: maybe it would be a nice addition to delta if it could be passed an option or somehow detect that the output is a combined diff output (e.g. maybe the first line of the diff output diff --cc ... gives it away) and highlight in a certain way for additions to "ours", in another for additions to "theirs" and another for additions to both, etc.

[dandavison]

Hi @akharrou, thanks for this, it doesn't exist yet but I absolutely agree -- I'd love to see this tackled. There are a couple of related issues: #189 and #609, but yours gives good discussion of merge conflict markers. If anyone would like to start making progress in this area that would be very welcome.

[dandavison]

@akharrou I've made a start on this. It would be great to have your feedback/thoughts. If you're interested, let's discuss in this issue: #189 (comment)

Screenshots from #189 copied below:

The merge conflict handling is particularly intended for users who have set merge.conflictstyle = diff3: it diffs the ancestral commit against the two derived commits in turn. I'm not sure how merge conflicts should be styled and welcome suggestions!

Combined diff handling looks like this (note the 2-char-wide prefixes):

[dandavison]

Initial handling of combined diff, and merge conflicts, has been implemented in #812. I'll release it soon; if anyone's able to test (on master) that would be fantastic.