mergetools / gvimdiff2on commit Merge branch 'jt/sha1-file-cleanup' (fa2a4bb)
   1. "$MERGE_TOOLS_DIR/vimdiff"