git.oblomov.eu Git - ikiwiki/commit

projects / ikiwiki / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: 50a9ef4) | patch

author	joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
	Sat, 17 Mar 2007 23:57:03 +0000 (23:57 +0000)
committer	joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
	Sat, 17 Mar 2007 23:57:03 +0000 (23:57 +0000)
commit	26213f8ee443addfbc74e92a693e172d023b16e6
tree	b034bfda2dc1ff04a7a5669f4c1a8d8747629915	tree \| snapshot
parent	50a9ef47538666c565c26ad7125a9e6484330cfd	commit \| diff

* Detect the case of two people independently creating the same page at the
same time, and let the second person resolve the conflict.

IkiWiki/CGI.pm		diff \| blob \| blame \| history
debian/changelog		diff \| blob \| blame \| history
templates/editpage.tmpl		diff \| blob \| blame \| history

Ikiwiki patches