Merge branch 'rw/apply-does-not-take-ignore-date'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"