mergetools / gvimdiff2on commit Merge branch 'jc/check-x-z' (0db320d)
   1. "$MERGE_TOOLS_DIR/vimdiff"