comparison tests/test-merge4.t @ 15182:de496752d936

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 30 Sep 2011 15:11:19 -0500
parents 4c94b6d0fb1c
children 63c817ea4a70
comparison
equal deleted inserted replaced
15179:d3b42e96cfcf 15182:de496752d936