diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2023-03-08 20:45:10 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-08 20:45:10 +1100 |
| commit | 804a134aa5e52a6545b24dd81ad7101692c55c39 (patch) | |
| tree | d501c9f29b2dd3afe88ea57591c8571931dbf3be /pkg/config | |
| parent | 82fc6fb111ba94aaabf78a00396e69689b860655 (diff) | |
| parent | 0bda93d4c3aea5f66c6a50322afc3b5a7e0ff75c (diff) | |
Merge pull request #2471 from stefanhaller/improve-custom-patch-conflict-handling
Diffstat (limited to 'pkg/config')
0 files changed, 0 insertions, 0 deletions