comparison tests/test-merge-prompt.t @ 26046:b930d4ef7739 stable

merge with i18n
author Matt Mackall <mpm@selenic.com>
date Tue, 18 Aug 2015 18:37:50 -0500
parents 9ab18a912c44
children 00209e38e7d9
comparison
equal deleted inserted replaced
26040:97208371715a 26046:b930d4ef7739