hgbook
diff it/examples/extdiff.diff.it @ 1011:a05a5ae66c38
merge
author | Romain PELISSE <belaran@gmail.com> |
---|---|
date | Mon Nov 23 10:51:14 2009 +0100 (2009-11-23) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/it/examples/extdiff.diff.it Mon Nov 23 10:51:14 2009 +0100 1.3 @@ -0,0 +1,10 @@ 1.4 +<!-- BEGIN extdiff.diff --> 1.5 +<screen><prompt>$</prompt> <userinput>hg diff</userinput> 1.6 +diff -r dc7b09ad1097 miofile 1.7 +--- a/miofile Fri Jun 05 15:50:16 2009 +0000 1.8 ++++ b/miofile Fri Jun 05 15:50:17 2009 +0000 1.9 +@@ -1,1 +1,2 @@ 1.10 + La prima riga. 1.11 ++La seconda riga. 1.12 +</screen> 1.13 +<!-- END extdiff.diff -->