Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
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
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Repository
d6a14e99104b63f263bf962e1855145656198694
Switch branch/tag
gitlab-ce
lib
gitlab
conflict
History
Find file
Select Archive Format
Source code
Download zip
Download tar.gz
Download tar.bz2
Download tar
Fix bug where conflict view would have one too many context sections
· 254dbad8
Douwe Maan
authored
Aug 10, 2016
254dbad8
Name
Last commit
Last update
..
file.rb
Loading commit data...
file_collection.rb
Loading commit data...
parser.rb
Loading commit data...
