Merge branch 'am/checkout-file-and-ref-ref-ambiguity'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"