Diff for "FAQ" - Mercurial

Differences between revisions 63 and 68 (spanning 5 versions)

$/!\$ Edit conflict - other version:

$/!\$ Edit conflict - your version:

$/!\$ End of edit conflict

Test myfunction comment

$/!\$ Edit conflict - other version:

$/!\$ Edit conflict - your version:

$/!\$ End of edit conflict

-  ⇤ ← Revision 63 as of 2007-10-15 16:32:05 → 
  Size: 52
  Editor: 85
  Comment: Test myfunction comment
+   ← Revision 68 as of 2007-10-15 20:37:17 → ⇥
  Size: 351
  Editor: 85
  Comment: Test myfunction comment
-Deletions are marked like this.
+Additions are marked like this.
 Line 1:
+---- /!\ '''Edit conflict - other version:''' ----

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

---- /!\ '''End of edit conflict''' ----
-Line 3:
+Line 9:
-CategoryNewFeatures
+CategoryHomepage

---- /!\ '''Edit conflict - other version:''' ----

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

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