comparison contrib/simplemerge @ 12896:b19b4c1df066 stable

rebase: improve resolve failure message
author Steve Borho <steve@borho.org>
date Sat, 30 Oct 2010 16:58:15 -0500
parents bb9f13974d8e
children 659f34b833b9
comparison
equal deleted inserted replaced
12895:53cfde2b3cf9 12896:b19b4c1df066