Merge branch 'ap/diff-ignore-blank-lines'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"