mergetools / gvimdiff2on commit Merge branch 'bw/push-options-recursively-to-submodules' into maint (eba2a68)
   1. "$MERGE_TOOLS_DIR/vimdiff"