Improve merges a bit - is not yet working correctly (see issues) #16

Open

moanos wants to merge 4 commits from merge-fix into main

Author	SHA1	Message	Date
Julian-Samuel Gebühr	5340e18c22	Add showdiff continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details	2023-07-26 11:32:59 +02:00
Julian-Samuel Gebühr	626516e98c	Don't fetch remote blocklist when merging files	2023-07-13 11:35:32 +02:00
Julian-Samuel Gebühr	3d0854ac4c	Use correct var	2023-07-13 11:34:42 +02:00
Julian-Samuel Gebühr	b5bb6f8480	Show nicer diff when merging	2023-07-13 11:33:55 +02:00