projects
/
cubicaltt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3cec719
75e006b
)
Merge branch 'no_regular' into equiv
author
Anders
<mortberg@chalmers.se>
Thu, 18 Jun 2015 14:44:49 +0000
(16:44 +0200)
committer
Anders
<mortberg@chalmers.se>
Thu, 18 Jun 2015 14:44:49 +0000
(16:44 +0200)
# Conflicts:
# CTT.hs
# Eval.hs
1
2
CTT.hs
patch
|
diff1
|
diff2
|
blob
|
history
Eval.hs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
CTT.hs
Simple merge
diff --cc
Eval.hs
Simple merge
projects / cubicaltt.git / commitdiff