]> CyberLeo.Net >> Repos - SourceForge/phpwiki.git/commit
projects / SourceForge / phpwiki.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 93fd283) | patch
add two merge conflict buttons within loadfile: "Keep Old" and "Overwrite with new...
authorrurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Tue, 2 Jan 2007 13:21:39 +0000 (13:21 +0000)
committerrurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Tue, 2 Jan 2007 13:21:39 +0000 (13:21 +0000)
commit1269ea7cdd754369ac1e5db312c4ccdb5e298f64
treea52003ead7e61d96965576c98371ec446fa11174tree | snapshot
parent93fd283baf2729cf0fc4f13e3e1956c381b64b56commit | diff
add two merge conflict buttons within loadfile: "Keep Old" and "Overwrite with new". enable edit toolbar there also. fix display of the Merge and Edit header.

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@5278 96ab9672-09ca-45d6-a79d-3d69d39ca109
lib/editpage.php diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.