diff options
| author | www-data <www-data@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-03-19 20:43:23 +0000 |
|---|---|---|
| committer | www-data <www-data@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-03-19 20:43:23 +0000 |
| commit | a4fb4c301fc9cb4e6c04f7a053dd05e123c0ae86 (patch) | |
| tree | 25164f46e15f9b45533616c67ea701b3ceb8e3d1 /doc | |
| parent | a53033e3dd2c6c93440c11a81ebdf26c63c43c5a (diff) | |
web commit by joey
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/features.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/features.mdwn b/doc/features.mdwn index ed62533d6..f362a7cbb 100644 --- a/doc/features.mdwn +++ b/doc/features.mdwn @@ -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. |