public String formatWithConflicts(String message,List<String> conflictingPaths) {StringBuilder sb = new StringBuilder();String[] lines = message.split("\n"); int firstFooterLine = ChangeIdUtil.indexOfFirstFooterLine(lines);for (int i = 0; i < firstFooterLine; i++)sb.append(lines[i]).append('\n');if (firstFooterLine == lines.length && message.length() != 0)sb.append('\n');addConflictsMessage(conflictingPaths, sb);if (firstFooterLine < lines.length)sb.append('\n');for (int i = firstFooterLine; i < lines.length; i++)sb.append(lines[i]).append('\n');return sb.toString();}
public virtual string FormatWithConflicts(string message, IList<string> conflictingPaths){StringBuilder sb = new StringBuilder(message);if (!message.EndsWith("\n") && message.Length != 0){sb.Append("\n");}sb.Append("\n");sb.Append("Conflicts:\n");foreach (string conflictingPath in conflictingPaths){sb.Append('\t').Append(conflictingPath).Append('\n');}return sb.ToString();}