summaryrefslogtreecommitdiff
path: root/t/t6045-merge-rename-delete.sh
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2018-04-27 22:48:16 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-05-02 07:47:47 +0900
commitd5bc6f292ab0a1715ff021f5854ac5a81c2b88b0 (patch)
tree02831ad6b2c8f35c3f26bc11a436ba641b0d2103 /t/t6045-merge-rename-delete.sh
parentGit 2.17 (diff)
downloadtgif-d5bc6f292ab0a1715ff021f5854ac5a81c2b88b0.tar.xz
rebase -i: demonstrate bugs with fixup!/squash! commit messages
When multiple fixup/squash commands are processed and the last one causes merge conflicts and is skipped, we leave the "This is a combination of ..." comments in the commit message. Noticed by Eric Sunshine. This regression test also demonstrates that we rely on the localized version of # This is a combination of <number> commits to contain the <number> in ASCII, which breaks under GETTEXT_POISON. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6045-merge-rename-delete.sh')
0 files changed, 0 insertions, 0 deletions