urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

web commit by joey

master
www-data 2006-03-19 20:43:23 +00:00
parent a53033e3dd
commit a4fb4c301f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/features.mdwn
View File

@ -73,7 +73,7 @@ Currently implemented:
/Discussion subpage. By default, these links are included in the
[[templates]] for each page.
* Smart merging and conflict resolution in web browser
* Smart merging and conflict resolution in your web browser
Since it uses subversion, ikiwiki takes advantage of its smart merging to avoid any conflicts when two people edit different parts of the same page at the same time. No annoying warnings about other editors, or locking, etc, instead the other person's changes will be automaticaly merged with yours when you commit.