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
cd6f679af401eda1f172402006ef8265f8bd58ea
Switch branch/tag
git2
tests
revert
History
Find file
Select Archive Format
Source code
Download zip
Download tar.gz
Download tar.bz2
Download tar
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...
rename.c
Loading commit data...
workdir.c
Loading commit data...
