projects
/
catagits/Catalyst-Runtime.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7060a57
8098d75
)
Merge branch 'pr/154' into release-candidates/rc-5.90116
Jay Hannah [Tue, 16 Jan 2018 22:43:48 +0000 (16:43 -0600)]
Conflicts jhannah resolved manually:
Makefile.PL
lib/Catalyst.pm
1
2
Makefile.PL
patch
|
diff1
|
diff2
|
blob
|
history
lib/Catalyst.pm
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Makefile.PL
Simple merge
diff --cc
lib/Catalyst.pm
Simple merge
projects / catagits/Catalyst-Runtime.git / commitdiff