Type alias BlobMergeCallbackParams

BlobMergeCallbackParams: {
    baseBlob: WalkerEntry | null;
    baseName: string;
    filePath: string;
    ourBlob: WalkerEntry | null;
    ourName: string;
    theirBlob: WalkerEntry | null;
    theirName: string;
}

Type declaration

  • baseBlob: WalkerEntry | null

    Base blob entry.

  • baseName: string

    The name to use in conflicted files (in diff3 format) for the base hunks.

  • filePath: string

    Rrefers to the path of the conflicted file, relative to the root of the git repository.

  • ourBlob: WalkerEntry | null

    Our blob entry.

  • ourName: string

    The name to use in conflicted files for our hunks.

  • theirBlob: WalkerEntry | null

    Their blob entry.

  • theirName: string

    The name to use in conflicted files for their hunks.

Settings

Member Visibility

Theme

Generated using TypeDoc