ux: always show Merge (Built-in) context menu entry for conflicts

Signed-off-by: leo <longshuang@msn.cn>

Author: love-linger

src/Views/WorkingCopy.axaml.cs

@@ -338,21 +338,16 @@ private ContextMenu CreateContextMenuForUnstagedChanges(ViewModels.WorkingCopy v
 
                     if (change.ConflictReason is Models.ConflictReason.BothAdded or Models.ConflictReason.BothModified)
                     {
-                        var isBinary = new Commands.IsBinary(repo.FullPath, "HEAD", change.Path).GetResultAsync().GetAwaiter().GetResult();
-                        if (!isBinary)
+                        var mergeBuiltin = new MenuItem();
+                        mergeBuiltin.Header = App.Text("ChangeCM.Merge");
+                        mergeBuiltin.Icon = App.CreateMenuIcon("Icons.Conflict");
+                        mergeBuiltin.Click += async (_, e) =>
                         {
-                            var mergeBuiltin = new MenuItem();
-                            mergeBuiltin.Header = App.Text("ChangeCM.Merge");
-                            mergeBuiltin.Icon = App.CreateMenuIcon("Icons.Conflict");
-                            mergeBuiltin.Click += async (_, e) =>
-                            {
-                                var ctx = new ViewModels.MergeConflictEditor(repo, change.Path);
-                                await ctx.LoadAsync();
-                                await App.ShowDialog(ctx);
-                                e.Handled = true;
-                            };
-                            menu.Items.Add(mergeBuiltin);
-                        }
+                            var ctx = new ViewModels.MergeConflictEditor(repo, change.Path);
+                            await ctx.LoadAsync();
+                            await App.ShowDialog(ctx);
+                            e.Handled = true;
+                        };
 
                         var mergeExternal = new MenuItem();
                         mergeExternal.Header = App.Text("ChangeCM.MergeExternal");
@@ -362,6 +357,8 @@ private ContextMenu CreateContextMenuForUnstagedChanges(ViewModels.WorkingCopy v
                             await vm.UseExternalMergeToolAsync(change);
                             e.Handled = true;
                         };
+
+                        menu.Items.Add(mergeBuiltin);
                         menu.Items.Add(mergeExternal);
                     }