mergetools / gvimdiff2on commit Merge branch 'jl/remote-rm-prune' into maint (c4f79d1)
   1. "$MERGE_TOOLS_DIR/vimdiff"