Mercurial > hg-stable

view tests/test-merge8.out @ 11184:7d99edddbaea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
extdiff: add labels, read diff arguments from [merge-tools] hgtk has been using these same configs since Feb. Users only have to name the tools they would like to use, ex: [extdiff] kdiff3 = meld =
author Steve Borho <steve@borho.org>
date Thu, 07 Jan 2010 22:19:05 -0600
parents a3d73b3e1f8a
children
line wrap: on
line source

updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
(run 'hg update' to get a working copy)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved