com.atlassian.bitbucket.scm.git.command.merge.conflict

Class ContentGitMergeConflict

java.lang.Object

com.atlassian.bitbucket.scm.git.command.merge.conflict.AbstractGitMergeConflict

com.atlassian.bitbucket.scm.git.command.merge.conflict.AbstractPathGitMergeConflict

com.atlassian.bitbucket.scm.git.command.merge.conflict.ContentGitMergeConflict

All Implemented Interfaces:

GitMergeConflict

public class ContentGitMergeConflict
extends AbstractPathGitMergeConflict

Constructor Summary

Constructors

Constructor and Description
ContentGitMergeConflict(String message, String path, boolean binary)

Method Summary

Modifier and Type	Method and Description
void	accept(GitMergeConflictVisitor visitor)
boolean	isBinary()

Methods inherited from class com.atlassian.bitbucket.scm.git.command.merge.conflict.AbstractPathGitMergeConflict

getPath

Methods inherited from class com.atlassian.bitbucket.scm.git.command.merge.conflict.AbstractGitMergeConflict

getMessage, getOurChange, getTheirChange, getType

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Constructor Detail

ContentGitMergeConflict

public ContentGitMergeConflict(@Nonnull
                               String message,
                               @Nonnull
                               String path,
                               boolean binary)

Method Detail

accept

public void accept(@Nonnull
                   GitMergeConflictVisitor visitor)

isBinary

public boolean isBinary()