mergetools / gvimdiff2on commit Merge branch 'cn/commit-amend-doc' into maint (788e98f)
   1. "$MERGE_TOOLS_DIR/vimdiff"