mergetools / gvimdiffon commit Merge branch 'mh/remove-subtree-long-pathname-fix' into maint (a3236f4)
   1. "$MERGE_TOOLS_DIR/vimdiff"