From 62a38d3e86b3138b3620569a30df71a4ffb27d1e Mon Sep 17 00:00:00 2001
From: Yuya Nishihara <yuya@tcha.org>
Date: Thu, 15 Dec 2022 14:10:37 +0900
Subject: [PATCH] cli: add kdiff3 edit-args to stock config

---
 src/merge-tools.toml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/merge-tools.toml b/src/merge-tools.toml
index bcea9c5c3..b41b02840 100644
--- a/src/merge-tools.toml
+++ b/src/merge-tools.toml
@@ -1,4 +1,6 @@
 [merge-tools.kdiff3]
+# --merge to open output pane, CreateBakFiles=0 to not include backup files in commit
+edit-args = ["--merge", "--cs", "CreateBakFiles=0"]
 merge-args = ["$base", "$left", "$right", "-o", "$output", "--auto"]
 
 [merge-tools.meld]