diff tests/test-merge-commit.t @ 19225:6cf8e3b4e074

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 21 May 2013 15:32:15 -0500
parents bcf29565d89f
children cb15835456cb
line wrap: on
line diff