hgbook

annotate en/examples/tour.merge.merge.out @ 286:f992b16d18a1

find changesets by author, revision, files, or words in the commit message
hg-interdiff: handle single-file diffs
author Nicholas Riley <njriley@uiuc.edu>
date Sun Jan 13 08:16:21 2008 -0800 (2008-01-13)
parents
children
rev   line source
bos@144 1 $ \textbf{hg merge}
bos@144 2 merging hello.c
bos@144 3 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
bos@144 4 (branch merge, don't forget to commit)