mergetools / gvimdiffon commit Merge branch 'rr/complete-difftool-fixup' (bdff0e3)
   1. "$MERGE_TOOLS_DIR/vimdiff"