tests/cherrypick · d2d4b681e22963e430d7b3128474f3f567f311e2 · lvzhengyang / git2 · GitLab

History Find file

merge: comment conflicts lines in MERGE_MSG · c0297d47
```
git has started adding comment markers to its conflict lines in
MERGE_MSG.  Match that behavior.
```
Edward Thomson committed Jan 30, 2022
c0297d47

Name	Last commit	Last update
..
bare.c		Loading commit data...
workdir.c		Loading commit data...