mergetools / gvimdiff2on commit Merge branch 'tb/t0027-raciness-fix' (643b622)
   1. "$MERGE_TOOLS_DIR/vimdiff"