mergetools / gvimdiff2on commit Merge branch 'tb/complete-word-diff-regex' (cc329f6)
   1. "$MERGE_TOOLS_DIR/vimdiff"