diff tests/test-import.t @ 986:c1f8ece4182d

evolve: add --tool option so we don't have to use HGMERGE
author Greg Ward <greg@gerg.ca>
date Sun, 22 Jun 2014 20:10:07 -0400
parents b286f77d680c
children f355bbc124fc
line wrap: on
line diff