diff tests/test-diff-binary-file.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 3fbef7ac26f0
children 0db6810e84e8
line wrap: on
line diff