Sublime Forum

Showing only conflict resolution diff of merge commits

#1

When selecting merge commit it shows the whole diff between merged branch and base branch.
Although it is helpful in certain situations, sometimes I would like to see only conflict resolution diffs, like e.g. gitk shows.

Is there a way to enable this behavior?

0 Likes

#2

No, but this is actually a great feature, you add an issue for it : https://github.com/sublimehq/sublime_merge/issues

0 Likes

#3

Here it is: https://github.com/sublimehq/sublime_merge/issues/1337

0 Likes