Merge branch 'ta/pretty-parse-config' into next
[git/jrn.git] / mergetools / vimdiff3
blob04a5bb0ea8484244e420ef13072773623c5b0366
1 . "$MERGE_TOOLS_DIR/vimdiff"