diff tests/test-merge-commit.t @ 19937:1596f2d8f242 stable 2.8-rc

merge default into stable for 2.8 freeze
author Matt Mackall <mpm@selenic.com>
date Sun, 20 Oct 2013 16:43:11 -0700
parents bcf29565d89f
children cb15835456cb
line wrap: on
line diff