merge-kernel: fixup adding files with CONFLICT(add/add) conflict type into index.
The usage of search pattern of the grep command is wrong in
"47063eb merge-kernel: add files with CONFLICT(add/add) conflict type into index."
The errorneous usage will cause failures for kernel merge under certain
conditions.
BUG=b:223526986
TEST=Test against the file generted by 'git merge'.
Change-Id: I33c99a416884aced2c3ac209675c96501f27b76c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/3686856
Tested-by: Martin Faltesek <mfaltesek@google.com>
Reviewed-by: Martin Faltesek <mfaltesek@google.com>
Commit-Queue: Martin Faltesek <mfaltesek@google.com>
1 file changed