diff options
| author | Piotr Janik <janikpiotrek@gmail.com> | 2011-05-16 12:51:05 +0200 |
|---|---|---|
| committer | Chris Aniszczyk <caniszczyk@gmail.com> | 2011-05-16 08:45:19 -0500 |
| commit | 2e43e1e904c9c8702d3c248d0fdb8b7cb6162cb2 (patch) | |
| tree | e29733efdc27dbc860473b0c576e1288062c2235 | |
| parent | 4b4df4ccf8e59273a7d78de2b378d530716b6f2d (diff) | |
| download | jgit-2e43e1e904c9c8702d3c248d0fdb8b7cb6162cb2.tar.gz jgit-2e43e1e904c9c8702d3c248d0fdb8b7cb6162cb2.zip | |
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>
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/Status.java | 8 |
1 files changed, 8 insertions, 0 deletions
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 7852aeee6e..e1491da374 100644 --- 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()); + } } |