hgbook
diff ja/examples/tour.merge.tip.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/tour.merge.tip.out Sat Sep 12 17:58:56 2009 +0200 1.3 @@ -0,0 +1,9 @@ 1.4 +$ \textbf{hg tip} 1.5 +changeset: 1.6 +tag: tip 1.7 +parent: 1.8 +parent: 1.9 +user: Bryan O'Sullivan <bos@serpentine.com> 1.10 + 1.11 +summary: Merged changes 1.12 +