COMMIT_EDITMSG « .gitted « merge-resolve « resources « tests - libgit2 - debian 12 backports: mozilla (cargo, rustc)

summary refs log tree commit diff stats

path: root/tests/resources/merge-resolve/.gitted/COMMIT_EDITMSG

blob: 245b18a2c50ea606d98bc19182a345effbd58b67 (plain)

1	`rename conflict theirs`