diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-05-01 14:14:44 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-01 14:14:44 +0900 |
| commit | 3c0a7b9d6b94ba86db2015445d0963a3fae932dc (patch) | |
| tree | 16283893fc42a9183adc5c4bce2be0029962a350 /builtin/merge-tree.c | |
| parent | Merge branch 'ls/travis-win-fix-status' (diff) | |
| parent | travis-ci: set DEVELOPER knob for Linux32 build (diff) | |
| download | tgif-3c0a7b9d6b94ba86db2015445d0963a3fae932dc.tar.xz | |
Merge branch 'ls/travis-stricter-linux32-builds'
32-bit Linux build on Travis CI uses stricter compilation options.
* ls/travis-stricter-linux32-builds:
travis-ci: set DEVELOPER knob for Linux32 build
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions