Add getConflicting() method in Status API

Bug: 345899
Change-Id: I133b9dd3e9a9c3c749547a884df3ce371929f38e
Signed-off-by: Piotr Janik <janikpiotrek@gmail.com>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/Status.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/Status.java
index 7852aeee6ebab7ee5da94c65c1ab062e9db7ede4..e1491da3745323f1781b94804a357b590d8ee985 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/Status.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/Status.java
@@ -119,4 +119,12 @@ public class Status {
        public Set<String> getUntracked() {
                return Collections.unmodifiableSet(diff.getUntracked());
        }
+
+       /**
+        * @return list of files that are in conflict. (e.g what you get if you
+        *         modify file that was modified by someone else in the meantime)
+        */
+       public Set<String> getConflicting() {
+               return Collections.unmodifiableSet(diff.getConflicting());
+       }
 }