mergetools / gvimdiff3on commit Merge branch 'jk/strip-suffix' (6e40947)
   1. "$MERGE_TOOLS_DIR/vimdiff"