mergetools / gvimdiff3on commit Merge branch 'jk/describe-omit-some-refs' into maint (501ec0d)
   1. "$MERGE_TOOLS_DIR/vimdiff"