Diff for "FAQ" - Mercurial

Differences between revisions 68 and 70 (spanning 2 versions)

$/!\$ Edit conflict - other version:

Test myfunction comment

$/!\$ Edit conflict - your version:

Test myfunction comment

$/!\$ End of edit conflict

-  ⇤ ← Revision 68 as of 2007-10-15 20:37:17 → 
  Size: 351
  Editor: 85
  Comment: Test myfunction comment
+   ← Revision 70 as of 2007-10-15 20:38:59 → ⇥
  Size: 255
  Editor: 85
  Comment: Test myfunction comment
-Deletions are marked like this.
+Additions are marked like this.
 Line 3:
+Test myfunction comment
----
CategoryNewFeatures
-Line 5:
+Line 8:
+Test myfunction comment
----
CategoryNewFeatures
-Line 7:
+Line 13:
-Test myfunction comment
----
CategoryHomepage

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

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

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