| commit | 5161fb89bfd9d102774a41233afdf192087bdb46 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 22 Sep 2010 16:35:59 +0000 (22 09:35 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 22 Sep 2010 16:35:59 +0000 (22 09:35 -0700) | ||
| tree | 5a95dac5cacdf7d28a7ae6f0d2e3d223f33ae84d | treesnapshot (tar.gz zip) |
| parent | 8a471baebcbfc9e9ccdf9829c0a9c1e39b563217 | commitdiff |
| parent | 4e5dd044c62f2a82de083e7cd46cad7b0d3465ae | commitdiff |
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
* 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