1
0
mirror of https://github.com/ceph/ceph synced 2024-12-22 11:31:55 +00:00
ceph/.gitattributes
Patrick Donnelly e0e348eedf
githubmap: define merge conflict resolution
Use "union" merge to automatically resolve trivial append merge conflicts from
using ptl-tool.py.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-10-10 12:06:34 -07:00

2 lines
23 B
Plaintext