From: Junio C Hamano Date: Mon, 11 Jun 2012 15:06:03 GMT Subject: Re: [PATCH v2 0/3] git-svn: use YAML format for mergeinfo cache when possible Message-ID: <7vy5nt99d0.fsf@alter.siamese.dyndns.org> In-Reply-To: <20120610100447.GE30151@burratino> Jonathan Nieder writes: > Eric Wong wrote: > >> 2/3 had a conflict with commit c26ddce86d7215b4d9687bd4c6b5dd43a3fabf31 >> which I resolved by hand > > That was fast. :) Checked by glancing through the output of > > git diff 9f7ad147^:git-svn.perl 9f7ad147:perl/Git/SVN/Ra.pm > > Looks good. > > Good night, > Jonathan Thanks, both. Pulled.