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
2a3e06359b8be1c5c53809a56e0fc3af62bdb024
Switch branch/tag
git2
tests
merge
workdir
submodules.c
Find file
Blame
History
Permalink
Do not attempt to check out submodule as blob when merging a submodule modify/deltete conflict
· 2a3e0635
David Turner
committed
Dec 04, 2017
2a3e0635
submodules.c
4.75 KB
Edit
