mergetools / gvimdiffon commit Merge branch 'nd/shallow-fixup' into maint (fdfec7a)
   1. "$MERGE_TOOLS_DIR/vimdiff"