mergetools / gvimdiffon commit Merge branch 'pt/pull-ff-vs-merge-ff' (22a1ae6)
   1. "$MERGE_TOOLS_DIR/vimdiff"