From f93c0b0d7eb3f4f2d0e2b4134fe4ac6183f28bca Mon Sep 17 00:00:00 2001
From: Milan Panta <milan.panta@shopify.com>
Date: Sun, 8 Feb 2026 12:53:47 -0500
Subject: [PATCH 1/2] fix(cmake): remove redundant OpenMP compile flags in
 non-Homebrew path

On newer CMake (4.x+), find_package(OpenMP) succeeds on macOS,
bypassing the Homebrew fallback. In the standard path,
target_compile_options added ${OpenMP_C_FLAGS} as a single quoted
argument ("-Xclang -fopenmp"), which clang rejects. This was
redundant since OpenMP::OpenMP_C already propagates compile flags
via INTERFACE properties.

Move target_compile_options into the HOMEBREW_OPENMP branch where
it's actually needed, and remove it from the standard path.
---
 libvscode-diff/CMakeLists.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libvscode-diff/CMakeLists.txt b/libvscode-diff/CMakeLists.txt
index 31280713..88ce8189 100644
--- a/libvscode-diff/CMakeLists.txt
+++ b/libvscode-diff/CMakeLists.txt
@@ -180,7 +180,6 @@ if(USE_OPENMP)
         target_link_libraries(vscode_diff PRIVATE ${OpenMP_omp_LIBRARY})
     else()
         # Standard OpenMP via find_package
-        target_compile_options(vscode_diff PRIVATE ${OpenMP_C_FLAGS})
         target_link_libraries(vscode_diff PRIVATE OpenMP::OpenMP_C)
         
         # Set RPATH to find bundled libgomp.so.1 in the same directory (Linux)
@@ -301,8 +300,8 @@ function(add_diff_test test_name)
     # Enable OpenMP for tests too
     if(USE_OPENMP)
         target_compile_definitions(${test_name} PRIVATE USE_OPENMP)
-        target_compile_options(${test_name} PRIVATE ${OpenMP_C_FLAGS})
         if(HOMEBREW_OPENMP)
+            target_compile_options(${test_name} PRIVATE ${OpenMP_C_FLAGS})
             target_include_directories(${test_name} PRIVATE ${HOMEBREW_LIBOMP_INCLUDE})
             target_link_libraries(${test_name} PRIVATE ${OpenMP_omp_LIBRARY})
         else()
@@ -386,8 +385,8 @@ endif()
 # Enable OpenMP for diff tool
 if(USE_OPENMP)
     target_compile_definitions(diff PRIVATE USE_OPENMP)
-    target_compile_options(diff PRIVATE ${OpenMP_C_FLAGS})
     if(HOMEBREW_OPENMP)
+        target_compile_options(diff PRIVATE ${OpenMP_C_FLAGS})
         target_include_directories(diff PRIVATE ${HOMEBREW_LIBOMP_INCLUDE})
         target_link_libraries(diff PRIVATE ${OpenMP_omp_LIBRARY})
     else()

From 671e8103e42dcd7b6a25fcda81f3c37fa1e1554d Mon Sep 17 00:00:00 2001
From: Yanuo Ma <myn508@hotmail.com>
Date: Tue, 10 Feb 2026 23:14:46 -0500
Subject: [PATCH 2/2] style: format actions.lua

---
 lua/codediff/ui/conflict/actions.lua | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/lua/codediff/ui/conflict/actions.lua b/lua/codediff/ui/conflict/actions.lua
index f3cc247e..4e129ecf 100644
--- a/lua/codediff/ui/conflict/actions.lua
+++ b/lua/codediff/ui/conflict/actions.lua
@@ -533,11 +533,7 @@ function M.accept_all_incoming(tabpage)
         if count > 0 then
           pcall(vim.cmd, "undojoin")
         end
-        local incoming_lines = tracking.get_lines_for_range(
-          session.original_bufnr,
-          block.output1_range.start_line,
-          block.output1_range.end_line
-        )
+        local incoming_lines = tracking.get_lines_for_range(session.original_bufnr, block.output1_range.start_line, block.output1_range.end_line)
         apply_to_result(result_bufnr, block, incoming_lines, base_lines)
         count = count + 1
       end
@@ -581,11 +577,7 @@ function M.accept_all_current(tabpage)
         if count > 0 then
           pcall(vim.cmd, "undojoin")
         end
-        local current_lines = tracking.get_lines_for_range(
-          session.modified_bufnr,
-          block.output2_range.start_line,
-          block.output2_range.end_line
-        )
+        local current_lines = tracking.get_lines_for_range(session.modified_bufnr, block.output2_range.start_line, block.output2_range.end_line)
         apply_to_result(result_bufnr, block, current_lines, base_lines)
         count = count + 1
       end
@@ -633,16 +625,8 @@ function M.accept_all_both(tabpage, first_input)
           pcall(vim.cmd, "undojoin")
         end
 
-        local incoming_lines = tracking.get_lines_for_range(
-          session.original_bufnr,
-          block.output1_range.start_line,
-          block.output1_range.end_line
-        )
-        local current_lines = tracking.get_lines_for_range(
-          session.modified_bufnr,
-          block.output2_range.start_line,
-          block.output2_range.end_line
-        )
+        local incoming_lines = tracking.get_lines_for_range(session.original_bufnr, block.output1_range.start_line, block.output1_range.end_line)
+        local current_lines = tracking.get_lines_for_range(session.modified_bufnr, block.output2_range.start_line, block.output2_range.end_line)
 
         -- Combine both sides
         local combined