summaryrefslogtreecommitdiff
path: root/builtin-merge-file.c
diff options
context:
space:
mode:
authorJohannes Sixt <johannes.sixt@telecom.at>2007-11-13 20:05:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-11-14 23:18:39 (GMT)
commit80bbe72b76ab91628b493b55ed74f6eec8432fed (patch)
treea472d6e5e29ae28fb29a51a8115013df8d3ade9b /builtin-merge-file.c
parent85dadc389468211a2fc0006ce8ea524490d417f5 (diff)
downloadgit-80bbe72b76ab91628b493b55ed74f6eec8432fed.zip
git-80bbe72b76ab91628b493b55ed74f6eec8432fed.tar.gz
git-80bbe72b76ab91628b493b55ed74f6eec8432fed.tar.bz2
Move #include <sys/select.h> and <sys/ioctl.h> to git-compat-util.h.
... since all system headers are pulled in via git-compat-util.h Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions