mergetools / gvimdiff3on commit trailer: be stricter in parsing separators (e431956)
   1. "$MERGE_TOOLS_DIR/vimdiff"