comparison Makefile @ 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 e84c69b43cdb
children 8a2a7f7d9df6
comparison
equal deleted inserted replaced
1660:b2df93c56ac4 1663:d529cdc0a3ee