diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-12-09 16:03:41 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-12-09 16:03:41 -0800 |
commit | 2f76a26ee707ab72c043148b38dfffb7a63ae516 (patch) | |
tree | 072dfb27fcb917d67626a9652ac474a35550f084 /Makefile | |
parent | ed94cc768c0341f2e033901bb14f6030780a201e (diff) | |
parent | 7d79cb6ad5ef3061c8b5b25ff3f2d779b02ec472 (diff) | |
download | git-2f76a26ee707ab72c043148b38dfffb7a63ae516.tar.gz git-2f76a26ee707ab72c043148b38dfffb7a63ae516.tar.xz |
Merge git://git.bogomips.org/git-svn
* git://git.bogomips.org/git-svn:
t9143: do not fail when unhandled.log.gz is not created
git-svn: allow the mergeinfo property to be set
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions