Add support for an automatic merge list to gitsync, properly escape user-supplied parameters, and improve error handling a bit.