mergetools / gvimdiff2on commit Merge branch 'sg/t7406-chain-fix' (cc2beaf)
   1. "$MERGE_TOOLS_DIR/vimdiff"