mergetools / gvimdiff2on commit Merge branch 'jk/delete-modechange-conflict' (203501b)
   1. "$MERGE_TOOLS_DIR/vimdiff"