Gjsify LogoGjsify Logo

GGIT_MERGE_FILE_DEFAULT: Defaults. GGIT_MERGE_FILE_STYLE_MERGE: Create standard conflicted merge files. GGIT_MERGE_FILE_STYLE_DIFF3: Create diff3-style files. GGIT_MERGE_FILE_SIMPLIFY_ALNUM: Condense non-alphanumeric regions for simplified diff file. GGIT_MERGE_FILE_IGNORE_WHITESPACE: Ignore all whitespace. GGIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE: Ignore changes in amount of whitespace. GGIT_MERGE_FILE_IGNORE_WHITESPACE_EOL: Ignore whitespace at end of line. GGIT_MERGE_FILE_DIFF_PATIENCE: Use the "patience diff" algorithm. GGIT_MERGE_FILE_DIFF_MINIMAL: Take extra time to find minimal diff.

bitfield

Index

Enumeration Members

DEFAULT: number
DIFF_MINIMAL: number
DIFF_PATIENCE: number
IGNORE_WHITESPACE: number
IGNORE_WHITESPACE_CHANGE: number
IGNORE_WHITESPACE_EOL: number
SIMPLIFY_ALNUM: number
STYLE_DIFF3: number
STYLE_MERGE: number

Legend

  • Module
  • Object literal
  • Variable
  • Function
  • Function with type parameter
  • Index signature
  • Type alias
  • Type alias with type parameter
  • Enumeration
  • Enumeration member
  • Property
  • Method
  • Interface
  • Interface with type parameter
  • Constructor
  • Property
  • Method
  • Index signature
  • Class
  • Class with type parameter
  • Constructor
  • Property
  • Method
  • Accessor
  • Index signature
  • Inherited constructor
  • Inherited property
  • Inherited method
  • Inherited accessor
  • Protected property
  • Protected method
  • Protected accessor
  • Private property
  • Private method
  • Private accessor
  • Static property
  • Static method