diff tests/test-issue1306.t @ 23024:ec36969497de

resolve: run happily after conflict-free merge
author Martin von Zweigbergk <martinvonz@gmail.com>
date Wed, 08 Oct 2014 22:30:04 -0700
parents 41885892796e
children 2fc86d92c4a9
line wrap: on
line diff