From 48650d3343cbba9b3cf07de4c49ff19211f4195b Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Tue, 6 Aug 2019 16:57:54 +0200
Subject: [PATCH] use 3-way merge when applying attached patchs

---
 git_redmine.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git_redmine.py b/git_redmine.py
index 95d250a..7a2f20d 100644
--- a/git_redmine.py
+++ b/git_redmine.py
@@ -183,7 +183,7 @@ def apply_attachments(repo, issue):
         attachment = attachments[index]
         content = attachment.download().content
         try:
-            p = repo.git.execute(['git', 'am'], istream=subprocess.PIPE, as_process=True)
+            p = repo.git.execute(['git', 'am', '-3'], istream=subprocess.PIPE, as_process=True)
             p.communicate(content)
         except Exception as e:
             print(e)