From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Sat, 12 Jul 2008 10:22:00 GMT
Subject: Re: [StGit PATCH 1/2] Do simple in-index merge with diff+apply instead of read-tree
Message-ID: <b0943d9e0807120322l350784b5sfceeb967f0956cdb@mail.gmail.com>
In-Reply-To: <20080702061243.11361.75544.stgit@yoghurt>

2008/7/2 Karl Hasselström <kha@treskal.com>:
> The advantage is that patch application will resolve some file content
> conflicts for us, so that we'll fall back to merge-recursive less
> often. This is a significant speedup, especially since merge-recursive
> needs to touch the worktree, which means we have to check out the
> index first.

Thanks.

-- 
Catalin