Merge branch 'tr/nth-previous-is-a-commit'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"