7 Commits

Author	SHA1	Message	Date
Jesse Duffield	f94d0be2c9	refactor the way we render lists	2020-02-25 21:21:07 +11:00
Giorgio Previtera	e83ef9858b	#477 Remove NeedMerge boolean ... Instead of storing the status in a new variable, derive it from the existing three fields	2019-07-27 11:05:23 +10:00
Giorgio Previtera	504d506575	477 Add new NeedReset property to File and update tests ... Use a boolean to determin if a file needs to be reset. We want to reset the file when discrading changes if there is a conflict.	2019-07-27 11:05:23 +10:00
Jesse Duffield	0f0fda1660	allow stashing staged changes ... reinstate old stash functionality with the 's' keybinding	2019-06-06 20:50:19 +10:00
Jesse Duffield	0079015102	distinguish between inline and non-inline merge conflicts	2019-03-03 15:58:01 +11:00
Jesse Duffield	ad93b4c863	consider whether the view has focus when rendering the contents of a view	2019-02-16 15:17:44 +11:00
Jesse Duffield	c00c834b35	standardise rendering of lists in panels	2018-09-17 21:02:30 +10:00