Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Repository
bb8fc663b25ab6c68152476742e288ecc8e9697d
Switch branch/tag
git2
tests
merge
workdir
simple.c
Find file
Blame
History
Permalink
Merge pull request #6197 from libgit2/ethomson/merge_msg_conflict_comment
· 61f1e31a
...
merge: comment conflicts lines in MERGE_MSG
Edward Thomson
committed
Feb 02, 2022
61f1e31a
simple.c
26.1 KB
Edit
