Matt Mackall <mpm@selenic.com> [Mon, 10 Dec 2007 10:24:14 -0600] rev 5635
merge: make return codes more sensible
Commands that call merge were exiting with a return code equal to the
number of unresolved files. We now return 1 if there are unresolved
files.