hgbook
view it/examples/daily.revert.modify.it @ 1113:613690ad6a9c
Merge with dongsheng
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Sat Jul 10 16:21:26 2010 +0100 (2010-07-10) |
| parents | |
| children |
line source
1 <!-- BEGIN daily.revert.modify -->
2 <screen><prompt>$</prompt> <userinput>cat file</userinput>
3 contenuto originale
4 <prompt>$</prompt> <userinput>echo cambiamento non voluto >> file</userinput>
5 <prompt>$</prompt> <userinput>hg diff file</userinput>
6 diff -r d17672b9fe6b file
7 --- a/file Fri Jun 05 15:50:07 2009 +0000
8 +++ b/file Fri Jun 05 15:50:07 2009 +0000
9 @@ -1,1 +1,2 @@
10 contenuto originale
11 +cambiamento non voluto
12 </screen>
13 <!-- END daily.revert.modify -->