diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-03-20 22:11:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-20 22:11:15 -0700 |
| commit | dd7d0d09765117700db87b4ecf63551dd56a267a (patch) | |
| tree | d7ee57d08d0a2855b28b882fd15e0b5e539cc59d /builtin/merge-ours.c | |
| parent | Merge branch 'so/submodule-no-update-first-time' into maint (diff) | |
| parent | git-compat-util.h: Honor HP C's noreturn attribute (diff) | |
| download | tgif-dd7d0d09765117700db87b4ecf63551dd56a267a.tar.xz | |
Merge branch 'mr/hpux' into maint
* mr/hpux:
git-compat-util.h: Honor HP C's noreturn attribute
Makefile: add NO_FNMATCH_CASEFOLD to HP-UX section
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions