7 Commits

Author	SHA1	Message	Date
Luka Markušić	f314cb3763	Remove alternative confirmation and return keymappings	2023-03-09 10:32:00 +01:00
Stefan Haller	723504a290	Keep side context in context stack when pushing a main context ... This fixes accordion mode for the commit files panel. When entering a file, the commit files panel should stay expanded.	2023-03-04 15:07:48 +01:00
Ryooooooga	39c20bc634	chore: change to work return-alt1 on all views	2023-02-11 21:19:47 +09:00
jiepeng	bc8050d8ac	typo	2022-09-17 15:10:41 -07:00
jiepeng	b8900baf1a	remove deprecated calls	2022-09-17 15:10:41 -07:00
Jesse Duffield	7410acd1aa	move merge conflicts code into controller	2022-08-07 11:16:03 +10:00
Jesse Duffield	445a625b56	rename merging context to mergeConflicts	2022-08-06 18:05:00 +10:00