From 8ae59a4922a61ce3f57e8bce8fbacbc43c873e08 Mon Sep 17 00:00:00 2001
From: zeapo <mohamed@zenadi.com>
Date: Thu, 10 Aug 2017 22:46:05 +0200
Subject: add a way to see the git status and abort a rebase

---
 app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java')

diff --git a/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java b/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java
index 6ca8bf49..9ab142c8 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java
+++ b/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java
@@ -8,6 +8,7 @@ import com.zeapo.pwdstore.R;
 
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.PullCommand;
+import org.eclipse.jgit.merge.MergeStrategy;
 
 import java.io.File;
 
-- 
cgit v1.2.3