Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
795ecb49
Commit
795ecb49
authored
Dec 31, 2015
by
Rubén Dávila
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix broken spec. #3945
parent
3fbcf52e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
8 deletions
+4
-8
spec/fixtures/parallel_diff_result.yml
spec/fixtures/parallel_diff_result.yml
+4
-8
No files found.
spec/fixtures/parallel_diff_result.yml
View file @
795ecb49
---
-
-
match
-
6
-
|
<span id="LC1" class="line"><span class="err">@@</span> <span class="o">-</span><span class="mi">6</span><span class="p">,</span><span class="mi">12</span> <span class="o">+</span><span class="mi">6</span><span class="p">,</span><span class="mi">18</span> <span class="err">@@</span> <span class="k">module</span> <span class="nn">Popen</span></span>
-
'
@@
-6,12
+6,18
@@
module
Popen'
-
2f6fcd96b88b36ce98c38da085c795a27d92a3dd_6_6
-
match
-
6
-
|
<span id="LC1" class="line"><span class="err">@@</span> <span class="o">-</span><span class="mi">6</span><span class="p">,</span><span class="mi">12</span> <span class="o">+</span><span class="mi">6</span><span class="p">,</span><span class="mi">18</span> <span class="err">@@</span> <span class="k">module</span> <span class="nn">Popen</span></span>
-
'
@@
-6,12
+6,18
@@
module
Popen'
-
2f6fcd96b88b36ce98c38da085c795a27d92a3dd_6_6
-
-
-
6
...
...
@@ -193,13 +191,11 @@
-
2f6fcd96b88b36ce98c38da085c795a27d92a3dd_17_23
-
-
match
-
19
-
|
<span id="LC23" class="line"><span class="err">@@</span> <span class="o">-</span><span class="mi">19</span><span class="p">,</span><span class="mi">6</span> <span class="o">+</span><span class="mi">25</span><span class="p">,</span><span class="mi">7</span> <span class="err">@@</span> <span class="k">module</span> <span class="nn">Popen</span></span>
-
'
@@
-19,6
+25,7
@@
module
Popen'
-
2f6fcd96b88b36ce98c38da085c795a27d92a3dd_19_25
-
match
-
25
-
|
<span id="LC23" class="line"><span class="err">@@</span> <span class="o">-</span><span class="mi">19</span><span class="p">,</span><span class="mi">6</span> <span class="o">+</span><span class="mi">25</span><span class="p">,</span><span class="mi">7</span> <span class="err">@@</span> <span class="k">module</span> <span class="nn">Popen</span></span>
-
'
@@
-19,6
+25,7
@@
module
Popen'
-
2f6fcd96b88b36ce98c38da085c795a27d92a3dd_19_25
-
-
-
19
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment