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 7852aeee6..e1491da37 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());
+	}
 }