hgbook
diff ja/examples/daily.revert.modify.out @ 996:6f8c48362758
merge with trunk
author | Romain PELISSE <belaran@gmail.com> |
---|---|
date | Sat Sep 12 17:58:56 2009 +0200 (2009-09-12) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/ja/examples/daily.revert.modify.out Sat Sep 12 17:58:56 2009 +0200 1.3 @@ -0,0 +1,10 @@ 1.4 +$ \textbf{cat file} 1.5 +original content 1.6 +$ \textbf{echo unwanted change >> file} 1.7 +$ \textbf{hg diff file} 1.8 +diff -r file 1.9 + 1.10 + 1.11 +@@ -1,1 +1,2 @@ original content 1.12 + original content 1.13 ++unwanted change