On Thu, Dec 16, 2010 at 09:29:19PM +0100, Chani Armitage wrote:
> sorry, git-svn fail. :(
> 
rebase instead of merging, otherwise you'll always produce such
artifacts.