mergetools / gvimdiffon commit Merge branch 'sg/t3600-nul-sha1-fix' (504c194)
   1. "$MERGE_TOOLS_DIR/vimdiff"