diff tests/test-merge5.t @ 20214:bdd340d8a595

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 02 Jan 2014 15:56:30 -0600
parents 41abe2e3e3b7
children fe80fdf68ba7
line wrap: on
line diff