| commit | ce2dacc95ea2e5650e3f75f1843cabd8b1d50503 | [log] [tgz] |
|---|---|---|
| author | William K Lin <[email protected]> | Wed Jun 08 07:19:48 2022 |
| committer | Chromeos LUCI <[email protected]> | Wed Jun 08 17:35:43 2022 |
| tree | abf9336aec3136bed49d7b86fe07c5f73ee4d623 | |
| parent | d59c4aec566733d9ca4e20e5985d505e9f762aeb [diff] |
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 <[email protected]> Reviewed-by: Martin Faltesek <[email protected]> Commit-Queue: Martin Faltesek <[email protected]>