summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2012-07-22 20:57:08 -0700
committerJunio C Hamano <gitster@pobox.com>2012-07-22 21:41:18 -0700
commit75cd75830993e3b545f2b151d8eea2f3178f9ba4 (patch)
treea30c6feb72b638f0448aac5bfcae1bceda0ea110 /merge-recursive.c
parent35989c68ee5f577ae959f69281e456fd14460469 (diff)
downloadgit-75cd75830993e3b545f2b151d8eea2f3178f9ba4.tar.gz
difftool: Eliminate global variables
Organize the script so that it has a single main() function which calls out to dir_diff() and file_diff() functions. This eliminates "dir-diff"-specific variables that do not need to be calculated when performing a regular file-diff. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions