![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 27 Oct 2010 04:40:54 +0000 (21:40 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 27 Oct 2010 04:40:54 +0000 (21:40 -0700) | ||
| commit | 75b17fee72a0f78e0ad31728771231f8b3ed4d56 | |
| tree | 190461ec1fedaf1a3c5d5d7fc9201a5a6455a144 | tree | snapshot |
| parent | 5a3a484d577d8612f729d64f3a069e63df07ec07 | commit | diff |
| parent | 4e5dd044c62f2a82de083e7cd46cad7b0d3465ae | commit | diff |
Merge branch 'jf/merge-ignore-ws'
* 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
| Documentation/merge-strategies.txt | diff1 | | diff2 | | blob | history |
| 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 |