diff mercurial/merge.py @ 33851:7827fbbd0b06

templatekw: specify plural form of instability Follows up 40739aef97f7.
author Yuya Nishihara <yuya@tcha.org>
date Sun, 13 Aug 2017 14:12:28 +0900
parents 055fee3547df
children 65ae54582713
line wrap: on
line diff