From 2e43e1e904c9c8702d3c248d0fdb8b7cb6162cb2 Mon Sep 17 00:00:00 2001
From: Piotr Janik <janikpiotrek@gmail.com>
Date: Mon, 16 May 2011 12:51:05 +0200
Subject: [PATCH] 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>
---
 org.eclipse.jgit/src/org/eclipse/jgit/api/Status.java | 8 ++++++++
 1 file changed, 8 insertions(+)

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