diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-17 10:52:19 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-17 10:52:19 +0300 |
| commit | deda26b9935bdca8d140006b224a278ec0377a33 (patch) | |
| tree | 7ea5b466b1bda5c7101a701547e31377e202b951 /git-merge-one-file.sh | |
| parent | 7f8ab8dc07ba4e892d0c2b5e7ac8436f9e845920 (diff) | |
| parent | 74ca5e6d7ca9351da4743f7a255069c4f3c55cb3 (diff) | |
Merge branch 'jc/makefile'
* jc/makefile:
Makefile: flatten enumeration of headers, objects and programs
Makefile: DIFF_OBJS is not special at all these days
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions