diff tests/test-commit-unresolved.t @ 16778:2ac08d8b21aa

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 22 May 2012 14:37:20 -0500 (2012-05-22)
parents 2371f4aea665
children f2719b387380
line wrap: on
line diff