summaryrefslogtreecommitdiff
path: root/daemon.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-02-05 17:54:17 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-02-05 17:54:17 -0800
commitcc91e1bd0537442339c4fd233b98a4b30e9dbe29 (patch)
treed9f41aadcb3c13bc24ffdc01c6a1187b88c54bf4 /daemon.c
parentMerge branch 'js/maint-all-implies-HEAD' into maint (diff)
parentMerge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-me... (diff)
downloadtgif-cc91e1bd0537442339c4fd233b98a4b30e9dbe29.tar.xz
Merge branch 'jc/maint-split-diff-metainfo' into maint
* jc/maint-split-diff-metainfo: diff.c: output correct index lines for a split diff
Diffstat (limited to 'daemon.c')
0 files changed, 0 insertions, 0 deletions