diff tests/test-merge-local.t @ 21433:ff4a270bd334

run-tests: teach unittest about warned results
author Gregory Szorc <gregory.szorc@gmail.com>
date Sun, 20 Apr 2014 11:55:02 -0700
parents 2371f4aea665
children ef1eb6df7071
line wrap: on
line diff