diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-05-09 13:32:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-09 13:32:54 -0700 |
| commit | b387c77b12953d543bf5efc3825b5be26d753f9c (patch) | |
| tree | 0b79d31d5f8b95c37eb9178152798a2f1aef71f1 /merge-blobs.h | |
| parent | faf8fde514df5b5ddd529ec5a89973f1961c5281 (diff) | |
| parent | 92758dd2a2de94c90c0697ef0e8174c3543a47f9 (diff) | |
| download | git-b387c77b12953d543bf5efc3825b5be26d753f9c.tar.gz | |
Sync with v1.8.2.3
* maint:
Git 1.8.2.3
t5004: avoid using tar for checking emptiness of archive
t5004: ignore pax global header file
mergetools/kdiff3: do not use --auto when diffing
transport-helper: trivial style cleanup
Diffstat (limited to 'merge-blobs.h')
0 files changed, 0 insertions, 0 deletions