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
e39d44d9e8b9cad753589c4488d8f4101cd90cab
Switch branch/tag
git2
tests
merge
History
Find file
Select Archive Format
Source code
Download zip
Download tar.gz
Download tar.bz2
Download tar
Merge pull request #4489 from libgit2/ethomson/conflicts_crlf
· 26f5d36d
...
Conflict markers should match EOL style in conflicting files
Edward Thomson
committed
Feb 04, 2018
26f5d36d
Name
Last commit
Last update
..
trees
Loading commit data...
workdir
Loading commit data...
conflict_data.h
Loading commit data...
driver.c
Loading commit data...
files.c
Loading commit data...
merge_helpers.c
Loading commit data...
merge_helpers.h
Loading commit data...
