Merge branch 'jh/checkout-auto-tracking'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"