summaryrefslogtreecommitdiff
path: root/t/t6022-merge-rename.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-12-23 12:51:11 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-23 12:51:11 -0800
commit73e7b2ef6c62b3ec345b557acb71a8da4798c70d (patch)
tree854951da72e8777ba36576a7278a10b9cc49b133 /t/t6022-merge-rename.sh
parentMerge branch 'maint' (diff)
parentdifftool: Fix failure on Cygwin (diff)
downloadtgif-73e7b2ef6c62b3ec345b557acb71a8da4798c70d.tar.xz
Merge branch 'rj/maint-difftool-cygwin-workaround'
* rj/maint-difftool-cygwin-workaround: difftool: Fix failure on Cygwin
Diffstat (limited to 't/t6022-merge-rename.sh')
0 files changed, 0 insertions, 0 deletions