diff tests/test-merge8.t @ 23193:14c6aab35a39

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 05 Nov 2014 11:16:31 -0600
parents f2719b387380
children eb586ed5d8ce
line wrap: on
line diff