/** * Construct a NotesMergeConflictException for the specified base, ours and * theirs note versions. * * @param base * note version * @param ours * note version * @param theirs * note version */ public NotesMergeConflictException(Note base, Note ours, Note theirs) { super(MessageFormat.format(JGitText.get().mergeConflictOnNotes, noteOn(base, ours, theirs), noteData(base), noteData(ours), noteData(theirs))); }
/** * Construct a NotesMergeConflictException for the specified base, ours and * theirs note versions. * * @param base * note version * @param ours * note version * @param theirs * note version */ public NotesMergeConflictException(Note base, Note ours, Note theirs) { super(MessageFormat.format(JGitText.get().mergeConflictOnNotes, noteOn(base, ours, theirs), noteData(base), noteData(ours), noteData(theirs))); }
/** * Construct a NotesMergeConflictException for the specified base, ours and * theirs note versions. * * @param base * note version * @param ours * note version * @param theirs * note version */ public NotesMergeConflictException(Note base, Note ours, Note theirs) { super(MessageFormat.format(JGitText.get().mergeConflictOnNotes, noteOn(base, ours, theirs), noteData(base), noteData(ours), noteData(theirs))); }