diff tests/test-merge-revert.t @ 24012:bc75f8750cde

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 03 Feb 2015 17:54:01 -0600
parents 28e2e3804f2e
children 55c6ebd11cb9
line wrap: on
line diff