view templates/filediff-raw.tmpl @ 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 f918a6fa2572
children
line wrap: on
line source

#header#
#diff#
#footer#