projects
/
p5sagit/gitosis-admin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
148da6f
a450e26
)
Merge branch 'master' of git.moose.perl.org:gitosis-admin
Chris Nehren [Mon, 21 Jun 2010 19:33:58 +0000 (15:33 -0400)]
Conflicts:
gitosis.conf
1
2
gitosis.conf
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
gitosis.conf
index
72ba758
,
948c14b
..
e4eddd0
---
1
/
gitosis.conf
---
2
/
gitosis.conf
+++ b/
gitosis.conf
@@@
-23,7
-23,7
+23,8
@@@
writable
Devel-Declare-Keyword
local-lib
Excel-Template
+ p5-mst-13.2
+ Promulger
[group corehackers]