nitlanguage
/
nit.git
/ blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
history
|
raw
|
HEAD
Merge: mongodb: Fixed failing test for `aggregate` method.
[nit.git]
/
contrib
/
nitcc
/
tests
/
sav
/
conflict-dangling.alt2.input2.res
1
Start
2
f
3
e_1
4
'1'@(1:1-1:2)
5
e_1
6
'1'@(1:2-1:3)
7
e_0
8
'0'@(1:3-1:4)
9
y_0
10
x
11
'2'@(1:4-1:5)
12
y_0
13
x
14
'2'@(1:5-1:6)
15
Eof@(1:6-1:6)=''