Junio C Hamano ff65e796f0 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
2016-09-26 07:16:48 -07:00
..
2015-04-18 18:35:48 -07:00
2014-01-21 13:16:17 -08:00
2015-04-18 18:35:48 -07:00
2015-04-18 18:35:48 -07:00
2015-04-18 18:35:48 -07:00