Jesse Duffield 5e95019b3f Missed a spot with this new string task thing ... The issue here was that we were using a string task but expecting to be able to set the origin straight after to point at the conflict, but because it's async it was actually resetting the origin to 0 after a little bit. The proper solution here is maybe to add a flag to that thing asking whether you want to reset main's origin. But I'm too lazy to do that right now so instead I'm just using setViewContent. That will probably cause issues in the future.		2020-01-12 14:43:17 +11:00
..
app	472 - Don't panic if not in a repository	2019-07-14 14:24:18 +10:00
commands	allow fast flicking through any list panel	2020-01-12 11:17:20 +11:00
config	add reflog tab in commits panel	2020-01-09 22:36:07 +11:00
gui	Missed a spot with this new string task thing	2020-01-12 14:43:17 +11:00
i18n	add git flow support	2020-01-08 22:03:15 +11:00
tasks	allow fast flicking through any list panel	2020-01-12 11:17:20 +11:00
test	fix up tests	2019-03-02 13:39:09 +11:00
theme	support split view in staging panel and staging ranges	2019-11-05 19:22:01 +11:00
updates	remove go-getter	2019-11-12 22:58:01 +11:00
utils	allow changing tabs with [ and ]	2019-11-21 22:07:14 +11:00