• Junio C Hamano's avatar
    Merge branch 'jn/merge-renormalize' · 8aed4a5e
    Junio C Hamano authored
    * jn/merge-renormalize:
      merge-recursive --renormalize
      rerere: never renormalize
      rerere: migrate to parse-options API
      t4200 (rerere): modernize style
      ll-merge: let caller decide whether to renormalize
      ll-merge: make flag easier to populate
      Documentation/technical: document ll_merge
      merge-trees: let caller decide whether to renormalize
      merge-trees: push choice to renormalize away from low level
      t6038 (merge.renormalize): check that it can be turned off
      t6038 (merge.renormalize): try checkout -m and cherry-pick
      t6038 (merge.renormalize): style nitpicks
      Don't expand CRLFs when normalizing text during merge
      Try normalizing files to avoid delete/modify conflicts when merging
      Avoid conflicts when merging branches with mixed normalization
    
    Conflicts:
    	builtin/rerere.c
    	t/t4200-rerere.sh
    8aed4a5e
rerere.c 14.6 KB