diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-21 01:08:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-21 01:08:10 -0800 |
| commit | f873dd5ac22fee648f9097d5a91200b6f4850ae0 (patch) | |
| tree | effdbc042e8919b36c92faca7707f84bbbac2a07 /builtin-merge-recursive.c | |
| parent | 2b5189e51855312a91dd23b5e7311c48944bc382 (diff) | |
| parent | 950db8798d51cb183c858938263425b367b21dfd (diff) | |
| download | git-f873dd5ac22fee648f9097d5a91200b6f4850ae0.tar.gz | |
Merge branch 'maint'
* maint:
Rename diff.suppress-blank-empty to diff.suppressBlankEmpty
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions