11 Commits

Author	SHA1	Message	Date
Jesse Duffield	7e141283f6	merge branch master	2018-08-11 15:09:37 +10:00
Jesse Duffield	44eaccfd14	switch to using the log package rather than directly writing to file	2018-08-09 20:29:58 +10:00
Jesse Duffield	ba9485ae57	support more merge conflict headers	2018-08-07 10:41:14 +10:00
Jesse Duffield	236eabb811	support Updated upstream message in merge panel	2018-08-07 10:39:49 +10:00
Jesse Duffield	001ea1002d	update options	2018-07-22 12:58:09 +10:00
Jesse Duffield	fab194e923	better handling of merge conflicts	2018-07-21 17:48:27 +10:00
Jesse Duffield	a47c889cbb	merge with develop	2018-07-21 16:06:38 +10:00
Jesse Duffield	16df4786c0	fix up code that was used to test this very application (yes I'm ashamed)	2018-07-21 15:53:52 +10:00
Jesse Duffield	5a143ea500	this will cause a conflict	2018-06-10 11:48:07 +10:00
Jesse Duffield	691972b544	scroll to merge conflict	2018-06-10 11:37:10 +10:00
Jesse Duffield	7653ff9a24	add support for merging	2018-06-09 19:06:33 +10:00