summaryrefslogtreecommitdiff
path: root/tests-clar/resources/merge-resolve/.gitted/COMMIT_EDITMSG
blob: 245b18a2c50ea606d98bc19182a345effbd58b67 (plain)
1
rename conflict theirs