projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3548b62 848bb66)
Merge commit 'remotes/smcv/ready/remove-pagespec-merge'
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 25 Aug 2009 21:21:19 +0000 (17:21 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 25 Aug 2009 21:21:19 +0000 (17:21 -0400)
1  2 
IkiWiki.pm patch | diff1 | diff2 | blob | history

diff --cc IkiWiki.pm
Simple merge
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.