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
65e4ab7a333eeda6398fcbf3e663d1ca1c1e53ef
Switch branch/tag
git2
src
merge.c
Find file
Blame
History
Permalink
Ignore submodules when checking for merge conflicts in the workdir.
· c864b4ab
Jason Haslam
committed
May 26, 2016
c864b4ab
merge.c
81.4 KB
Edit
