diff options
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/merge')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java index 1ba80869c2..eed1dcfa88 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java @@ -68,7 +68,7 @@ public class MergeFormatter { * the merge result which should be presented * @param seqName * When a conflict is reported each conflicting range will get a - * name. This name is following the "<<<<<<< " or ">>>>>>> " + * name. This name is following the "<<<<<<< " or ">>>>>>> " * conflict markers. The names for the sequences are given in * this list * @param charsetName |