]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0b65a8d b5f325c)
Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-modern...
authorJunio C Hamano <gitster@pobox.com>
Mon, 26 Sep 2016 14:16:29 +0000 (07:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 Sep 2016 14:16:48 +0000 (07:16 -0700)
commitff65e796f00097c118a85ac40e51405080e98627
tree6d40a7e6c47c860a1f56b1691d89894f03f5745atree | snapshot
parent0b65a8dbdb38962e700ee16776a3042beb489060commit | diff
parentb5f325cb4a0d986689177857a62007027a532d31commit | diff
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
git-gui/lib/merge.tcl diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.