diff tests/test-merge1.t @ 27627:dcbba68e076f

histedit: hook afterresolvedstates
author timeless <timeless@mozdev.org>
date Thu, 24 Dec 2015 20:41:17 +0000
parents 6a6e78f84cc6
children 7b5c8c8a2f8c
line wrap: on
line diff