mirror of
https://github.com/ceph/ceph
synced 2024-12-27 05:53:20 +00:00
e0e348eedf
Use "union" merge to automatically resolve trivial append merge conflicts from using ptl-tool.py. Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2 lines
23 B
Plaintext
2 lines
23 B
Plaintext
.githubmap merge=union
|