Merge branch 'jt/apply-reverse-twice'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"