From 35d9231411baa43ae214dcf1245f3b570d366e3e Mon Sep 17 00:00:00 2001 From: sommerfeld Date: Fri, 31 Jan 2025 17:29:58 +0000 Subject: Add mergiraf --- home/.config/git/attributes | 24 ++++++++++++++++++++++++ home/.config/git/config | 5 ++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 home/.config/git/attributes (limited to 'home') diff --git a/home/.config/git/attributes b/home/.config/git/attributes new file mode 100644 index 0000000..1870ab4 --- /dev/null +++ b/home/.config/git/attributes @@ -0,0 +1,24 @@ +*.java merge=mergiraf +*.rs merge=mergiraf +*.go merge=mergiraf +*.js merge=mergiraf +*.jsx merge=mergiraf +*.json merge=mergiraf +*.yml merge=mergiraf +*.yaml merge=mergiraf +*.toml merge=mergiraf +*.html merge=mergiraf +*.htm merge=mergiraf +*.xhtml merge=mergiraf +*.xml merge=mergiraf +*.c merge=mergiraf +*.h merge=mergiraf +*.cc merge=mergiraf +*.cpp merge=mergiraf +*.hpp merge=mergiraf +*.cs merge=mergiraf +*.dart merge=mergiraf +*.scala merge=mergiraf +*.sbt merge=mergiraf +*.ts merge=mergiraf +*.py merge=mergiraf diff --git a/home/.config/git/config b/home/.config/git/config index 4500dc4..8638332 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -35,7 +35,10 @@ ff = only [merge] tool = conflictmarker - conflictstyle = diff3 + conflictstyle = zdiff3 +[merge "mergiraf"] + name = mergiraf + driver = mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P [mergetool "conflictmarker"] cmd = $EDITOR "$MERGED" [commit] -- cgit v1.2.3-70-g09d2