summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-08-02 08:29:42 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-08-02 08:30:02 -0700
commitee38d823f74bd8872c1e793f98a5b5523ee04646 (patch)
treedcd31c87f2f3754329416a216ce7a1714f861b9a /merge-recursive.h
parentAdd a macro DIFF_QUEUE_CLEAR. (diff)
downloadtgif-ee38d823f74bd8872c1e793f98a5b5523ee04646.tar.xz
Fix DIFF_QUEUE_CLEAR refactoring
It introduced a macro to reduce repeated assignments to three fields, but an unrelated and incorrect change snuck in by mistake, which broke commands like "git diff-files -p --submodule". Noticed by Sven Verdoolaege. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions