feat: add configurable three-pane conflict views

2026-10-16 16:19:54 +02:00
parent a6310594c5
commit de6a57e67d
11 changed files with 176 additions and 20 deletions
@@ -18,6 +18,7 @@ Vamp.configure do |config|
  config.diff_view_mode = "split" # or "unified"
  config.diff_split_orientation = "vertical" # or "horizontal"
  config.diff_follow_working_copy = true # false keeps the selected Working After endpoint
+  config.resolve_history_layout = "columns" # or "base_below" for left/right above the base
  # config.popup.command = { anchor: :bottom_left }
  # config.popup.search = { anchor: :center }
  # Status above, tabs and live battery below; either bar accepts all segments.