comparison tests/test-merge-prompt.t @ 21969:42418c49b0d2 stable

merge with i18n
author Matt Mackall <mpm@selenic.com>
date Fri, 01 Aug 2014 11:44:50 -0500
parents c8ba98bf0e71
children 9ab18a912c44
comparison
equal deleted inserted replaced
21966:be94ed4baa5d 21969:42418c49b0d2