summaryrefslogtreecommitdiff
path: root/t/t5100/0002mboxrd
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-10-11 14:20:37 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-11 14:20:37 -0700
commit0bc409dab941d7df065c486342cefcde78647c42 (patch)
tree931b4f8a3ece93d179f28d31d1e26d9d125f4789 /t/t5100/0002mboxrd
parentMerge branch 'kd/mailinfo-quoted-string' into maint (diff)
parentMerge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-... (diff)
downloadtgif-0bc409dab941d7df065c486342cefcde78647c42.tar.xz
Merge branch 'rs/git-gui-use-modern-git-merge-syntax' into maint
The original command line syntax for "git merge", which was "git merge <msg> HEAD <parent>...", has been deprecated for quite some time, and "git gui" was the last in-tree user of the syntax. This is finally fixed, so that we can move forward with the deprecation. * rs/git-gui-use-modern-git-merge-syntax: git-gui: stop using deprecated merge syntax
Diffstat (limited to 't/t5100/0002mboxrd')
0 files changed, 0 insertions, 0 deletions