projects
/
scpubgit/stemmatology.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fdab1c0
53b60c2
)
Merge branch 'master' into phylo, deleting stemmaweb
Tara L Andrews [Tue, 11 Sep 2012 20:17:36 +0000 (22:17 +0200)]
Conflicts:
lib/Text/Tradition/Stemma.pm
stemmaweb/lib/stemmaweb/Controller/Root.pm
t/text_tradition_stemma.t
1
2
lib/Text/Tradition/Stemma.pm
patch
|
diff1
|
diff2
|
blob
|
history
t/text_tradition_stemma.t
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/Text/Tradition/Stemma.pm
Simple merge
diff --cc
t/text_tradition_stemma.t
Simple merge
projects / scpubgit/stemmatology.git / commitdiff