Diff for "FAQ" - Mercurial

Differences between revisions 60 and 61

$/!\$ Edit conflict - other version:

Test myfunction comment

$/!\$ Edit conflict - your version:

Test myfunction comment

$/!\$ End of edit conflict

-  ⇤ ← Revision 60 as of 2007-10-15 16:30:02 → 
  Size: 49
  Editor: 85
  Comment: Test myfunction comment
+   ← Revision 61 as of 2007-10-15 16:30:46 → ⇥
  Size: 249
  Editor: 85
  Comment: Test myfunction comment
-Deletions are marked like this.
+Additions are marked like this.
 Line 1:
+---- /!\ '''Edit conflict - other version:''' ----
-Line 4:
+Line 6:
+---- /!\ '''Edit conflict - your version:''' ----
Test myfunction comment
----
CategoryCategory

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