mergetools / gvimdiff2on commit Merge branch 'jc/parseopt-expiry-errors' (3915f9a)
   1. "$MERGE_TOOLS_DIR/vimdiff"