diff doc/ja/docbook.ja.conf @ 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 a64fdaf60f9d
children ea7b982b6c08
line wrap: on
line diff