3 Commits

Author	SHA1	Message	Date
dahn	6790371fe2	fix merge diff display (#7047)	2023-01-09 11:43:32 +01:00
Remi Bergsma	52edbbb6cc	Show actual diff in commits after merge	2015-12-12 11:22:32 +01:00
Miguel Ferreira	9211202bab	Add git merge scripts	2015-08-19 17:22:45 +02:00