mergetools / gvimdiff2on commit Merge branch 'jk/use-write-script-more' (2416803)
   1. "$MERGE_TOOLS_DIR/vimdiff"