diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-10-26 21:40:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-26 21:40:54 -0700 |
| commit | 75b17fee72a0f78e0ad31728771231f8b3ed4d56 (patch) | |
| tree | 190461ec1fedaf1a3c5d5d7fc9201a5a6455a144 /git-svn.perl | |
| parent | Merge branch 'ml/completion-zsh' (diff) | |
| parent | merge-recursive: options to ignore whitespace changes (diff) | |
| download | git-75b17fee72a0f78e0ad31728771231f8b3ed4d56.tar.gz git-75b17fee72a0f78e0ad31728771231f8b3ed4d56.zip | |
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
Diffstat (limited to 'git-svn.perl')
0 files changed, 0 insertions, 0 deletions