summaryrefslogtreecommitdiff
path: root/t/t1021-rerere-in-workdir.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-07-23 10:09:49 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-07-23 10:09:49 -0700
commit9ae54a1ddebbbc8f3f12116f3ad9fd6dcf74bf02 (patch)
tree8e54067d63efd990fea605b463a558801c8f4ab5 /t/t1021-rerere-in-workdir.sh
parentSync with Git 1.8.3.4 (diff)
parentt7600: fix typo in test title (diff)
downloadtgif-9ae54a1ddebbbc8f3f12116f3ad9fd6dcf74bf02.tar.xz
Merge branch 'mv/merge-ff-tristate'
* mv/merge-ff-tristate: t7600: fix typo in test title
Diffstat (limited to 't/t1021-rerere-in-workdir.sh')
0 files changed, 0 insertions, 0 deletions