![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 22 Sep 2010 16:35:59 +0000 (09:35 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 22 Sep 2010 16:35:59 +0000 (09:35 -0700) | ||
| commit | 5161fb89bfd9d102774a41233afdf192087bdb46 | |
| tree | 5a95dac5cacdf7d28a7ae6f0d2e3d223f33ae84d | tree | snapshot |
| parent | 8a471baebcbfc9e9ccdf9829c0a9c1e39b563217 | commit | diff |
| parent | 4e5dd044c62f2a82de083e7cd46cad7b0d3465ae | commit | diff |
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
| builtin/checkout.c | diff1 | | diff2 | | blob | history |
| builtin/merge-recursive.c | diff1 | | diff2 | | blob | history |
| builtin/merge.c | diff1 | | diff2 | | blob | history |
| merge-recursive.c | diff1 | | diff2 | | blob | history |
| merge-recursive.h | diff1 | | diff2 | | blob | history |
| rerere.c | diff1 | | diff2 | | blob | history |