summaryrefslogtreecommitdiff
path: root/t/t6025-merge-symlinks.sh
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2019-06-14 05:16:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-06-14 12:30:23 -0700
commitcc8d872e691c9a0cda5a0b08e1c7e92acb6b7ebe (patch)
tree3584b2706d7d3a14dfe18eee22bc4ea1526670cf /t/t6025-merge-symlinks.sh
parentsequencer: do not squash 'reword' commits when we hit conflicts (diff)
downloadtgif-cc8d872e691c9a0cda5a0b08e1c7e92acb6b7ebe.tar.xz
t3404: fix a typo
This one slipped through the review of a9279c678588 (sequencer: do not squash 'reword' commits when we hit conflicts, 2018-06-19). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6025-merge-symlinks.sh')
0 files changed, 0 insertions, 0 deletions