mergetools / gvimdiff2on commit test-lib.sh - define and use GREP_STRIPS_CR (97669ee)
   1. "$MERGE_TOOLS_DIR/vimdiff"