Browse Source

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>
stable-1.0
Piotr Janik 14 years ago committed by Chris Aniszczyk
parent
commit
2e43e1e904
  1. 8
      org.eclipse.jgit/src/org/eclipse/jgit/api/Status.java

8
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());
}
}

Loading…
Cancel
Save