summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-23 12:51:11 -0800
committerJunio C Hamano <gitster@pobox.com>2010-12-23 12:51:11 -0800
commit73e7b2ef6c62b3ec345b557acb71a8da4798c70d (patch)
tree854951da72e8777ba36576a7278a10b9cc49b133 /merge-recursive.h
parent4e3a1b24ad4ee3fc7dc21a8b8f39c41202d6b0a5 (diff)
parentd531174fe386af00755619d6a204db74a30954f8 (diff)
downloadgit-73e7b2ef6c62b3ec345b557acb71a8da4798c70d.tar.gz
Merge branch 'rj/maint-difftool-cygwin-workaround'
* rj/maint-difftool-cygwin-workaround: difftool: Fix failure on Cygwin
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions