Mercurial > hg

view tests/test-resolve.out @ 7760:fe4052a512fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n: add Japanese translation
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sat, 14 Feb 2009 01:56:34 +0900
parents 9f73bddb9d0b
children 9fe7e6acf525
line wrap: on
line source

adding file
% create a second head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
% failing merge
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
% resolve -l, should be empty