diff tests/test-merge7.t @ 17602:ccd28eca37f6

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 18 Sep 2012 16:19:56 -0500
parents b87acfda5268
children 5ed6a375e9ca
line wrap: on
line diff