mergetools / gvimdiff3on commit Merge branch 'sg/commit-cleanup-scissors' into maint (a94594d)
   1. "$MERGE_TOOLS_DIR/vimdiff"