summaryrefslogtreecommitdiff
path: root/t/t4101/diff.1-2
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-09-26 07:16:29 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-26 07:16:48 -0700
commitff65e796f00097c118a85ac40e51405080e98627 (patch)
tree6d40a7e6c47c860a1f56b1691d89894f03f5745a /t/t4101/diff.1-2
parentGit 2.8.4 (diff)
parentgit-gui: stop using deprecated merge syntax (diff)
downloadtgif-ff65e796f00097c118a85ac40e51405080e98627.tar.xz
Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-modern-git-merge-syntax
* 'rs/use-modern-git-merge-syntax' of git-gui: git-gui: stop using deprecated merge syntax
Diffstat (limited to 't/t4101/diff.1-2')
0 files changed, 0 insertions, 0 deletions