From 52e26a8d9aacfd038913f7d56898aa5aae975ad0 Mon Sep 17 00:00:00 2001
From: Yuya Nishihara <yuya@tcha.org>
Date: Thu, 15 Dec 2022 14:03:38 +0900
Subject: [PATCH] cli: move merge-tools name to [table] header

Even though we need to repeat "merge-tools", I feel it's a bit better to
group parameters by tool name. Tools are sorted by name.
---
 src/merge-tools.toml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/merge-tools.toml b/src/merge-tools.toml
index 4d0569605..bcea9c5c3 100644
--- a/src/merge-tools.toml
+++ b/src/merge-tools.toml
@@ -1,11 +1,11 @@
-[merge-tools]
-meld.merge-args    = ["$left", "$base", "$right",
-      "-o", "$output", "--auto-merge"]
-kdiff3.merge-args  = ["$base", "$left", "$right",
-      "-o", "$output", "--auto"]
-vimdiff.program = "vim"
-vimdiff.merge-args = ["-f", "-d", "$output", "-M",
-      "$left", "$base", "$right",
-      "-c", "wincmd J", "-c", "set modifiable",
-      "-c", "set write"]
-vimdiff.merge-tool-edits-conflict-markers=true
+[merge-tools.kdiff3]
+merge-args = ["$base", "$left", "$right", "-o", "$output", "--auto"]
+
+[merge-tools.meld]
+merge-args = ["$left", "$base", "$right", "-o", "$output", "--auto-merge"]
+
+[merge-tools.vimdiff]
+program = "vim"
+merge-args = ["-f", "-d", "$output", "-M", "$left", "$base", "$right",
+              "-c", "wincmd J", "-c", "set modifiable", "-c", "set write"]
+merge-tool-edits-conflict-markers = true