diff tests/test-double-merge.t @ 18531:8caf566f4910 stable

merge with i18n
author Matt Mackall <mpm@selenic.com>
date Fri, 01 Feb 2013 15:23:37 -0600
parents a6fe1b9cc68f
children 5ed6a375e9ca
line wrap: on
line diff