Mercurial > hg-stable

view tests/test-issue842.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 4b0c9c674707
children
line wrap: on
line source

adding a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
% should issue warning
adding a
created new head
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
% should not issue warning
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
marked working directory as branch testing
% should not issue warning