fix: diff view does not use --cached for unmerged changes

Author: isc-pbarton

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Fixed
 - Web UI workspace view labels changes as Merge Conflict if there are unmerged changes (#890)
+- Web UI workspace view displays diff correctly for files with merge conflicts (#898)
 
 ## [2.14.0] - 2025-11-07
 

git-webui/release/share/git-webui/webui/js/git-webui.js

@@ -3210,7 +3210,7 @@ webui.NewChangedFilesView = function(workspaceView) {
         self.fileToDiff = $(element).attr("data-filename");
         var indexStatus = $(element).attr("data-index-status");
         var gitOpts = [];
-        if (indexStatus != " ") {
+        if ((indexStatus != " ") && (indexStatus != "U")) {
             gitOpts.push("--cached");
         }
         workspaceView.diffView.update("diff", gitOpts, self.fileToDiff, "stage");

git-webui/src/share/git-webui/webui/js/git-webui.js

@@ -3210,7 +3210,7 @@ webui.NewChangedFilesView = function(workspaceView) {
         self.fileToDiff = $(element).attr("data-filename");
         var indexStatus = $(element).attr("data-index-status");
         var gitOpts = [];
-        if (indexStatus != " ") {
+        if ((indexStatus != " ") && (indexStatus != "U")) {
             gitOpts.push("--cached");
         }
         workspaceView.diffView.update("diff", gitOpts, self.fileToDiff, "stage");