hgbook
diff en/examples/tour.merge.tip.out @ 396:0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
author | Javier Rojas <jerojasro@devnull.li> |
---|---|
date | Thu Nov 06 23:01:34 2008 -0500 (2008-11-06) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/en/examples/tour.merge.tip.out Thu Nov 06 23:01:34 2008 -0500 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 +