diff tests/test-merge-commit.t @ 17545:fc1a5d0eb3bb

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 13 Sep 2012 14:33:10 -0500
parents b87acfda5268
children 5ed6a375e9ca
line wrap: on
line diff