From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Thu, 10 Nov 2005 14:28:42 +0000 (+0000)
Subject: Optimise pick --fold to use git-apply first
X-Git-Tag: v0.8~27
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/d218d2f8c234b1cb17616dc98d8e5d670138e124?ds=inline;hp=d218d2f8c234b1cb17616dc98d8e5d670138e124

Optimise pick --fold to use git-apply first

If "git-diff-tree | git-apply" fails, the command falls back to a
three-way merge.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
---