diff tests/test-rename-merge1.t @ 33338:ad124b3208fd

test-rebase: conditionalize output instead of tests This should help prevent breakage like was fixed in the last patch.
author Matt Harbison <matt_harbison@yahoo.com>
date Sat, 08 Jul 2017 14:15:01 -0400
parents 296d55def9c4
children 009d0283de5f
line wrap: on
line diff