mergetools / gvimdiff3on commit Merge branch 'jk/simplify-csum-file-sha1fd-check' (09e32fa)
   1. "$MERGE_TOOLS_DIR/vimdiff"