mergetools / vimdiff3on commit Merge branch 'sg/complete-decorate-full-not-long' into maint (23903b9)
   1. "$MERGE_TOOLS_DIR/vimdiff"