mergetools / gvimdiff3on commit Merge branch 'nd/remote-plural-ours-plus-theirs' into maint (4e327bb)
   1. "$MERGE_TOOLS_DIR/vimdiff"