  Re: [PATCH] Allow the merge tool to abort the merge  From:
Stefan Sperling <stsp_at_elego.de> Date: Tue, 30 Dec 2008
02:22:35 +0100  On Mon, Dec 29, 2008 at 12:19:00PM -0800, John
Gardiner Myers wrote: > Stefan Sperling wrote: > > 1) Why not
just abort on exit code != 0? > Because the current behavior of
proceeding with the merge, leaving the > conflicts is more
useful in the common case.  OK, so we're talking about having
three different possibilities:  (cases coded by exit code) 0)
External tool merges files successfully   -> merge proceeds,
file is marked as merged 1) External tool fails merging files,
leaving conflict markers   -> merge proceeds, file remains in
conflict 2) External tool fails merging files, leaving conflict
markers,    and wants to abort the merge   -> merge is aborted,
file remains in conflict  Currently, we only have case 0 and 1,
right?  What do we do with tools that do exit 2 for some other
reason? Not all tools people might want to use with Subversion
might be aware of any exit co