diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-05-03 23:26:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-03 23:26:54 -0700 |
| commit | 9aae177a4adff326421e55c7c0f3138de15ce2c1 (patch) | |
| tree | ca19b08ff373ea122f87c90d03d111b03a89921e /builtin-diff-files.c | |
| parent | blame: use .mailmap unconditionally (diff) | |
| parent | gitweb: use decode_utf8 directly (diff) | |
| download | tgif-9aae177a4adff326421e55c7c0f3138de15ce2c1.tar.xz | |
Merge branch 'maint'
* maint:
gitweb: use decode_utf8 directly
posix compatibility for t4200
Document 'opendiff' value in config.txt and git-mergetool.txt
Allow PERL_PATH="/usr/bin/env perl"
Make xstrndup common
diff.c: fix "size cache" handling.
http-fetch: Disable use of curl multi support for libcurl < 7.16.
Diffstat (limited to 'builtin-diff-files.c')
0 files changed, 0 insertions, 0 deletions