diff tests/test-merge4.t @ 21263:f3e37409ecd3

resolve: split test Part of test-resolve.t is split into multiple tests to create an injection point for new tests that will be added in subsequent patches.
author Gregory Szorc <gregory.szorc@gmail.com>
date Fri, 18 Apr 2014 18:26:42 -0700
parents 63c817ea4a70
children 8561ad49915d
line wrap: on
line diff