2 commits

Author	SHA1	Message	Date
Gavin Andresen	c53b1ece1b	Fix github-merge with git version 2.1.0 ... Running git version 2.1.0 on OSX (homebrew), I get fatal: '1q': not a non-negative integer I'm guessing git command-line parsing got more strict recently?	2014-08-19 13:47:37 -04:00
Wladimir J. van der Laan	e5adec35c6	contrib: add sipa's github-merge script	2013-11-24 12:44:31 +01:00