summaryrefslogtreecommitdiff
path: root/t/t4252/am-test-1-1
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-10-03 13:30:36 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-03 13:30:37 -0700
commit5a2c86fb08cc195ca39d82e2c2d84158f05b96fc (patch)
tree79611e2f21d430a6f6ca00aa9e811c95a35fe356 /t/t4252/am-test-1-1
parentMerge branch 'jc/verify-loose-object-header' (diff)
parentMerge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-... (diff)
downloadtgif-5a2c86fb08cc195ca39d82e2c2d84158f05b96fc.tar.xz
Merge branch 'rs/git-gui-use-modern-git-merge-syntax'
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/t4252/am-test-1-1')
0 files changed, 0 insertions, 0 deletions