Diff for "FAQ" - Mercurial

Differences between revisions 55 and 58 (spanning 3 versions)

Test myfunction comment

$/!\$ Edit conflict - other version:

$/!\$ Edit conflict - your version:

$/!\$ End of edit conflict

-  ⇤ ← Revision 55 as of 2007-10-15 12:30:14 → 
  Size: 52
  Editor: 85
  Comment: Test myfunction comment
+   ← Revision 58 as of 2007-10-15 12:32:18 → ⇥
  Size: 218
  Editor: 85
  Comment: Test myfunction comment
-Deletions are marked like this.
+Additions are marked like this.
 Line 3:
-CategoryNewFeatures
+---- /!\ '''Edit conflict - other version:''' ----
CategoryHomepage

---- /!\ '''Edit conflict - your version:''' ----
CategoryHomepage

---- /!\ '''End of edit conflict''' ----