summaryrefslogtreecommitdiff
path: root/po4a
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2019-07-24 20:08:23 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2020-02-02 16:46:43 +0000
commit8f086237a8e78c4bd7d018f70818092eb27a5440 (patch)
treeb696600e705f7faea4a606eeb7e6f91c03cba260 /po4a
parent22c53928460b993bddadb72e8fd51dd916e29cfc (diff)
d-m-{merge,debrebase}(7): Set 'merge' in gbp.conf
This enables simplifying runes which are more frequently to be typed. 'merge-mode' no longer need be set since in the only case where the manpages recommend allowing `gbp import-orig` to perform a merge, a different merge mode is required (and specified in that rune). This is part of #932954. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'po4a')
0 files changed, 0 insertions, 0 deletions