projects
/
margebot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ffa092d
59097b0
)
Merge branch 'master' of ssh://pwan.org/var/www/git/projects/margebot
author
Jude N
<juden@pwan.org>
Mon, 12 Feb 2018 05:46:22 +0000
(
00:46
-0500)
committer
Jude N
<juden@pwan.org>
Mon, 12 Feb 2018 05:46:22 +0000
(
00:46
-0500)
1
2
plugins/marge.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
plugins/marge.py
Simple merge