diff tests/test-rename-merge1.t @ 16004:7d12b2d3a83d stable

merge with i18n
author Matt Mackall <mpm@selenic.com>
date Fri, 27 Jan 2012 18:43:31 -0600
parents efdcce3fd2d5
children ad394c897b16
line wrap: on
line diff