Merge branch 'develop'

Author: love-linger

src/Commands/QueryCommitChildren.cs

@@ -12,7 +12,7 @@ public QueryCommitChildren(string repo, string commit, int max)
             Args = $"rev-list -{max} --parents --branches --remotes ^{commit}";
         }
 
-        public IEnumerable<string> Result()
+        public List<string> Result()
         {
             Exec();
             return _lines;

src/ViewModels/CommitDetail.cs

@@ -615,7 +615,7 @@ private void Refresh()
                     var cmdChildren = new Commands.QueryCommitChildren(_repo.FullPath, _commit.SHA, max) { Cancel = _cancelToken };
                     var children = cmdChildren.Result();
                     if (!cmdChildren.Cancel.Requested)
-                        Dispatcher.UIThread.Post(() => Children.AddRange(children));
+                        Dispatcher.UIThread.Post(() => Children = children);
                 });
             }
 

src/ViewModels/Conflict.cs

@@ -49,6 +49,11 @@ public Conflict(Repository repo, WorkingCopy wc, Models.Change change)
                 Theirs = merge.Source;
                 Mine = repo.CurrentBranch;
             }
+            else
+            {
+                Theirs = "Stash or Patch";
+                Mine = repo.CurrentBranch;
+            }
         }
 
         public void UseTheirs()

src/ViewModels/Launcher.cs

@@ -525,6 +525,7 @@ private void SwitchWorkspace(Workspace to)
             }
 
             _ignoreIndexChange = false;
+            Preferences.Instance.Save();
             GC.Collect();
         }
 

src/Views/Preferences.axaml.cs

@@ -189,6 +189,7 @@ protected override void OnClosing(WindowClosingEventArgs e)
                     new Commands.Config(null).Set($"gpg.{GPGFormat.Value}.program", GPGExecutableFile);
             }
 
+            ViewModels.Preferences.Instance.Save();
             base.OnClosing(e);
         }
 

src/Views/WorkingCopy.axaml

@@ -239,6 +239,13 @@
                           <TextBlock Margin="4,0,0,0" Text="{Binding Subject}"/>
                         </StackPanel>
                       </DataTemplate>
+
+                      <DataTemplate DataType="x:String">
+                        <StackPanel Orientation="Horizontal">
+                          <Path Width="12" Height="12" Data="{StaticResource Icons.Changes}"/>
+                          <TextBlock Margin="4,0,0,0" Text="{Binding}"/>
+                        </StackPanel>
+                      </DataTemplate>
                     </StackPanel.DataTemplates>
 
                     <Path Width="64" Height="64" Data="{StaticResource Icons.Conflict}" Fill="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>