mergetools / gvimdiffon commit Merge branch 'bm/interpret-trailers-cut-line-is-eom' into maint (00c0e40)
   1. "$MERGE_TOOLS_DIR/vimdiff"