Diff for "FAQ" - Mercurial

Differences between revisions 52 and 58 (spanning 6 versions)

Test myfunction comment

$/!\$ Edit conflict - other version:

$/!\$ Edit conflict - your version:

$/!\$ End of edit conflict

-  ⇤ ← Revision 52 as of 2007-10-15 08:30:17 → 
  Size: 49
  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:
+---- /!\ '''Edit conflict - other version:''' ----
-Line 4:
+Line 6:
+---- /!\ '''Edit conflict - your version:''' ----
CategoryHomepage

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