4 commits

Author	SHA1	Message	Date
Jörn Friedrich Dreyer	c615b3527f	show readonly message in file conflict dialog, make it always selected	2014-12-11 16:32:27 +01:00
Jörn Friedrich Dreyer	c90b0ac00b	Fix copy conflict dialog translation	2014-04-07 11:46:47 +02:00
Jörn Friedrich Dreyer	7bd5e89f8c	simplify conflict template handling, fix reopen after ESC	2013-09-18 17:22:29 +02:00
Jörn Friedrich Dreyer	49fd7e9f1e	refactor dialog creation	2013-09-04 16:42:18 +02:00