Junio C Hamano bf93f8322c Merge branch 'jf/merge-ignore-ws' into next ...

* jf/merge-ignore-ws:
  merge-recursive: options to ignore whitespace changes
  merge-recursive --patience
  ll-merge: replace flag argument with options struct
  merge-recursive: expose merge options for builtin merge

2010-09-15 13:23:30 -07:00

25 KiB

Raw Blame History

View Raw