![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 15 May 2011 03:44:09 +0000 (20:44 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 15 May 2011 03:44:09 +0000 (20:44 -0700) | ||
| commit | 2f80de956f71880b000933b1b9bff4991c5b3ca9 | |
| tree | 46baf64190b08c6c609915aa24e59578d87b1e0a | tree | snapshot |
| parent | 2de58b398b5a1f81bf74a385e41cfc2fcd9cb427 | commit | diff |
| parent | 8c2be75fe117f5079087a6dfb07c573cc6716143 | commit | diff |
Merge branch 'maint'
* maint:
add, merge, diff: do not use strcasecmp to compare config variable names
* maint:
add, merge, diff: do not use strcasecmp to compare config variable names
| builtin/add.c | diff1 | | diff2 | | blob | history |
| merge-recursive.c | diff1 | | diff2 | | blob | history |