It doesn't seem like it's possible to do a split-diff of a merge conflict?
It doesn't seem like it's possible to do a split-diff of a merge conflict?