From: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun, 10 Jun 2012 10:04:47 GMT
Subject: Re: [PATCH v2 0/3] git-svn: use YAML format for mergeinfo cache when possible
Message-ID: <20120610100447.GE30151@burratino>
In-Reply-To: <20120610090039.GA12868@dcvr.yhbt.net>

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