mergetools / gvimdiff3on commit Merge branch 'rw/apply-does-not-take-ignore-date' into maint (ba1edc9)
   1. "$MERGE_TOOLS_DIR/vimdiff"