hgbook

view en/examples/branching.merge.out @ 336:7e52f0cc4516

find changesets by author, revision, files, or words in the commit message
changed es/hgext.tex
changed es/hook.tex
changed es/kdiff3.png
changed es/license.tex
changed es/mq-collab.tex
changed es/mq-ref.tex
changed es/mq.tex
changed es/note.png
changed es/tour-merge.tex
changed es/undo-manual-merge.dot
changed es/undo-non-tip.dot

files needed to compile the pdf version of the book.
author jerojasro@localhost
date Sat Oct 18 15:44:41 2008 -0500 (2008-10-18)
parents
children
line source
1 $ \textbf{cd ../main}
2 $ \textbf{hg pull ../stable}
3 pulling from ../stable
4 searching for changes
5 adding changesets
6 adding manifests
7 adding file changes
8 added 1 changesets with 1 changes to 1 files (+1 heads)
9 (run 'hg heads' to see heads, 'hg merge' to merge)
10 $ \textbf{hg merge}
11 merging myfile
12 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
13 (branch merge, don't forget to commit)
14 $ \textbf{hg commit -m 'Bring in bugfix from stable branch'}
15 $ \textbf{cat myfile}
16 This is a fix to a boring feature.
17 This is exciting and new!