diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-26 14:16:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-26 14:16:48 (GMT) |
| commit | ff65e796f00097c118a85ac40e51405080e98627 (patch) | |
| tree | 6d40a7e6c47c860a1f56b1691d89894f03f5745a /builtin/diff-tree.c | |
| parent | 0b65a8dbdb38962e700ee16776a3042beb489060 (diff) | |
| parent | b5f325cb4a0d986689177857a62007027a532d31 (diff) | |
| download | git-ff65e796f00097c118a85ac40e51405080e98627.zip git-ff65e796f00097c118a85ac40e51405080e98627.tar.gz git-ff65e796f00097c118a85ac40e51405080e98627.tar.bz2 | |
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 'builtin/diff-tree.c')
0 files changed, 0 insertions, 0 deletions