diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-18 18:23:53 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-18 18:23:53 +0900 |
| commit | 39847644adb3678da91048b2ac6ebc2b3c475f3a (patch) | |
| tree | 3dd357abac07f6ccad330e55733dd9f641925a58 /builtin/merge.c | |
| parent | ab96f28ba4deb71ff64b31bd63cee96314db7112 (diff) | |
| parent | adb59def102180b0e23ac835f41cd4f6b7a0960f (diff) | |
Merge branch 'js/mingw-res-rebuild'
Windows build update.
* js/mingw-res-rebuild:
Windows: force-recompile git.res for differing architectures
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions