mergetools / gvimdiff2on commit Merge branch 'jk/mergetool' (55f56fe)
   1. "$MERGE_TOOLS_DIR/vimdiff"