diff templates/map @ 1663:d529cdc0a3ee

return a non-zero exit code when a merge failed
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 30 Jan 2006 12:02:06 +1300
parents e8a3df8b62b3
children 4b1e0dc913bf
line wrap: on
line diff