diff i18n/pt_BR.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 b97b2fbf525c
children 3b84bde06d17
line wrap: on
line diff