mergetools / gvimdiff2on commit Merge branch 'tb/complete-checkout' (30af513)
   1. "$MERGE_TOOLS_DIR/vimdiff"