summaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Alexey Shumkin <alex.crezoff@gmail.com>2015-09-05 01:24:10 +0300
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-09-08 11:09:10 -0700
commitc61eb4106d9ea77ba770c28a018cafa3b81b927e (patch)
tree415a99d042561b796693c6c030f60bb8ec10018e /t/t7610-mergetool.sh
parentSync with maint (diff)
downloadtgif-c61eb4106d9ea77ba770c28a018cafa3b81b927e.tar.xz
t7900-subtree: test the "space in a subdirectory name" case
In common case there can be spaces in a subdirectory name. Change tests accorgingly to this statement. Also, as far as a call to the `rejoin_msg` function (in `cmd_split`) does not take into account such a case this patch fixes commit message when `--rejoin` option is set . Besides, as `fixnl` and `multiline` functions did not take into account the "new" tested "space in a subdirectory name" case they become unused and redundant, so they are removed. Signed-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7610-mergetool.sh')
0 files changed, 0 insertions, 0 deletions