comparison tests/test-merge-types.t @ 15735:5b384b7f48d5

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 26 Dec 2011 18:08:20 -0600
parents efdcce3fd2d5
children ca5cc2976574
comparison
equal deleted inserted replaced
15734:9b0efacd7745 15735:5b384b7f48d5