mergetools / gvimdiff3on commit Merge branch 'jk/symbolic-ref-maint' into maint (e002527)
   1. "$MERGE_TOOLS_DIR/vimdiff"