comparison tests/test-simple4server.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 f80e8e3c3726
children 59bc29c84ce0
comparison
equal deleted inserted replaced
985:6a37044ec0b3 986:c1f8ece4182d