feat: choose all theirs (#361)

2024-08-29 20:32:00 +08:00
parent 24b0bfadea
commit cdd7730bd7
3 changed files with 39 additions and 28 deletions
--- a/README.md
+++ b/README.md
@@ -106,6 +106,7 @@ _See [config.lua#L9](./lua/avante/config.lua) for the full config_
    diff = {
      ours = "co",
      theirs = "ct",
+      all_theirs = "ca",
      both = "cb",
      cursor = "cc",
      next = "]x",