Commit 5ef43d41b036d4178c6d886c2222db9dd7f32fc1

Edward Thomson 2015-06-23T10:29:59

git_diff__merge: allow pluggable diff merges