Merge branch 'rs/git-gui-use-modern-git-merge-syntax'
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Oct 2016 20:30:36 +0000 (13:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Oct 2016 20:30:37 +0000 (13:30 -0700)
commit5a2c86f...08cc195ca39d82e2c2d84158f05b96fc
tree79611e2...21d430a6f6ca00aa9e811c95a35fe356copy hash to clipboard (tree)
parent71a57ab...2d211be19729c3afaf0a7c7283c7a4e2copy hash to clipboard (diff)
parentff65e79...f00097c118a85ac40e51405080e98627copy hash to clipboard (diff)