summaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-10-06 12:10:29 -0700
committerJunio C Hamano <gitster@pobox.com>2010-10-06 12:10:29 -0700
commitee79b21778cb6b20451f2357ede33f3f5760338c (patch)
tree59585f9c989690e7cab321d8ca905dbcf907434c /merge-file.c
parenta6fa2a87b78eda52a871d539e15a7493073b307a (diff)
parentb3457afc4f6da6cfef265359ed182c5fcd6d266c (diff)
downloadgit-ee79b21778cb6b20451f2357ede33f3f5760338c.tar.gz
Merge branch 'ab/makefile-track-cc'
* ab/makefile-track-cc: Makefile: add CC to TRACK_CFLAGS
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions