From 483d5e258f14176ed3cacd1138fae723a6a5fce3 Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@gnome.org>
Date: Sat, 9 Jul 2011 11:01:54 -0400
Subject: apply: pass "-3" to git-am

Using 3-way merge makes it much more likely that the patch will apply
correctly when the local tree is newer than the tree that the patch
was generated from, and if the patch doesn't apply cleanly, git will
leave a file with conflict markers rather than forcing you to reapply
the patch manually.

https://bugzilla.gnome.org/show_bug.cgi?id=657558
---
 git-bz | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-bz b/git-bz
index 7d8d804..cfda958 100755
--- a/git-bz
+++ b/git-bz
@@ -1552,7 +1552,7 @@ def do_apply(bug_reference):
         f.close()
 
         try:
-            process = git.am(filename, _interactive=True)
+            process = git.am("-3", filename, _interactive=True)
         except CalledProcessError:
             print "Patch left in %s" % filename
             break
-- 
cgit v1.2.3