patch #1 - add checkchanged property to catch tools that abort and yet return 0 (success) patch #2 - allow ui.merge = <tool-with-args> to work essentially like it did before the filemerge refactor. -- Steve