diff tests/test-copy-move-merge.t @ 29349:8bf84295e59b

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 14 Jun 2016 14:52:58 -0500
parents d7af9b4ae7dd
children a7f8939641aa
line wrap: on
line diff