Duplicate the behaviour of Git merge for simple renaming / movement of files with minor editing on either branch being merged.

[sageserpent-open]

What it says on the tin - git merge already handles this nicely, and Kinetic Merge should do at least as well with the same semantics.

This should hold for edits made on either branch, or both branches, or neither, and should hold for both clean merge outcomes and conflicted ones.

The assumption made here is that the only code motion is parallel - so all the sections in the file stay in the same order, albeit with edits.

[sageserpent-open]

This is already supported - there is a test here.