summaryrefslogtreecommitdiff
path: root/Documentation/git-resolve-script.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2005-08-29 12:41:03 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2005-08-29 12:41:03 -0700
commit2c04662d89eaa55cecb6effd743c17051d1458ec (patch)
treeaa27bc3ebd317ed648b152ef92e00870d9b33414 /Documentation/git-resolve-script.txt
parentMerge refs/heads/portable from http://www.cs.berkeley.edu/~ejr/gits/git.git (diff)
downloadtgif-2c04662d89eaa55cecb6effd743c17051d1458ec.tar.xz
Revert "Replace zero-length array decls with []."
This reverts 6c5f9baa3bc0d63e141e0afc23110205379905a4 commit, whose change breaks gcc-2.95. Not that I ignore portability to compilers that are properly C99, but keeping compilation with GCC working is more important, at least for now. We would probably end up declaring with "name[1]" and teach the allocator to subtract one if we really aimed for portability, but that is left for later rounds. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-resolve-script.txt')
0 files changed, 0 insertions, 0 deletions