i18n-jp: translation update for
288ba6d6c5c7
this revision consists of contribution by:
Muraoka Yusuke<yusuke.muraoka@gmail.com>
Tadashi Jokagi <elf@elf.no-ip.org>
UENISHI Kota <kuenishi@gmail.com>
Yuki KODAMA <endflow.net@gmail.com>
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% should fail because not at a head
abort: branch 'default' has 3 heads - please merge with an explicit rev
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% should fail because > 2 heads
abort: branch 'default' has 3 heads - please merge with an explicit rev
% should succeed
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should succeed - 2 heads
changeset: 1:ba677d0156c1
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: b
changeset: 3:903c264cdf57
parent: 1:ba677d0156c1
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: d
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should fail because at tip
abort: there is nothing to merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% should fail because 1 head
abort: there is nothing to merge - use "hg update" instead