mergetools / gvimdiff2on commit Merge branch 'jc/parseopt-command-modes' (366b80b)
   1. "$MERGE_TOOLS_DIR/vimdiff"