projects
/
catagits/Gitalist.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f796a86
8bfa1d9
)
Merge branch 'master' of git://github.com/zts/Gitalist into zts-patches
Dan Brook [Thu, 19 Nov 2009 18:49:16 +0000 (18:49 +0000)]
Conflicts:
lib/Gitalist/Controller/Root.pm
1
2
lib/Gitalist/Controller/Root.pm
patch
|
diff1
|
diff2
|
blob
|
history
t/03legacy_uri.t
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/Gitalist/Controller/Root.pm
Simple merge
diff --cc
t/03legacy_uri.t
Simple merge
projects / catagits/Gitalist.git / commitdiff