diff tests/test-double-merge.t @ 14481:b2ee161328e0

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 31 May 2011 15:28:23 -0500
parents 4c94b6d0fb1c
children efdcce3fd2d5
line wrap: on
line diff