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.
win32: remove text man pages from Windows package
The HTML versions are still packaged, and do not suffer from
eoln problems. This solves
issue531 (addition through subtraction)
win32: use relative path to install source
Remove hard-coded path to the source repo to be packaged.