Skip to content
  • Junio C Hamano's avatar
    Merge branch 'sb/diff-color-move-more' · a81575aa
    Junio C Hamano authored
    "git diff --color-moved" feature has further been tweaked.
    
    * sb/diff-color-move-more:
      diff.c: offer config option to control ws handling in move detection
      diff.c: add white space mode to move detection that allows indent changes
      diff.c: factor advance_or_nullify out of mark_color_as_moved
      diff.c: decouple white space treatment from move detection algorithm
      diff.c: add a blocks mode for moved code detection
      diff.c: adjust hash function signature to match hashmap expectation
      diff.c: do not pass diff options as keydata to hashmap
      t4015: avoid git as a pipe input
      xdiff/xdiffi.c: remove unneeded function declarations
      xdiff/xdiff.h: remove unused flags
    a81575aa