RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-01 08:32:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
6863b4914e
ceph/.gitattributes

2 lines
23 B
Plaintext
Raw Normal View History

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 19:05:41 +00:00
.githubmap merge=union
Reference in New Issue Copy Permalink