Revert 4b7f53da7618 (simplify-merges: drop merge from irrelevant side branch, 2013...
[git/jrn.git] / mergetools / vimdiff2
blob04a5bb0ea8484244e420ef13072773623c5b0366
1 . "$MERGE_TOOLS_DIR/vimdiff"