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 foo
adding bar
adding baz
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
% fail with three heads
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
abort: branch 'default' has 3 heads - please merge with an explicit rev
% close one of the heads
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
% succeed with two open heads
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)