Diff for "FAQ" - Mercurial

Differences between revisions 55 and 61 (spanning 6 versions)

$/!\$ Edit conflict - other version:

Test myfunction comment

$/!\$ Edit conflict - your version:

Test myfunction comment

$/!\$ End of edit conflict

-  ⇤ ← Revision 55 as of 2007-10-15 12:30:14 → 
  Size: 52
  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 3:
+Line 5:
-CategoryNewFeatures
+CategoryCategory

---- /!\ '''Edit conflict - your version:''' ----
Test myfunction comment
----
CategoryCategory

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