comparison i18n/ja.po @ 23472:48cdf90f17c5

update: remove redundant and misplaced merge tests The "nothing to merge" case is covered by test-merge-default.t. The "uncommitted changes" case is covered by test-merge1.t (and others). The "merge -f" case is covered by test-merge-force.t.
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 02 Dec 2014 16:39:59 -0800
parents c6329a0e8f94
children b65a01a4316b
comparison
equal deleted inserted replaced
23471:57b9c51cb4b4 23472:48cdf90f17c5