[IMP] git-diff-merge: prefer delta [1] over diff-so-fancy

[1] https://github.com/dandavison/delta
KangOl · Apr 29, 2020 · 9b8a296 · 9b8a296
1 parent 304fca0
commit 9b8a296
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/git-diff-merge b/git-diff-merge
@@ -2,4 +2,4 @@
 set -e
 
 cd "${GIT_PREFIX:-.}"
-git diff --cached "$@" | filterdiff -x '*.po' -x '*.pot' | colordiff | diff-so-fancy | awk '$0 != p || $0 ~ /^─+$/ { print $0 } { p=$0 }' | less --tabs=4 -RFX
+git diff --cached "$@" | filterdiff -x '*.po' -x '*.pot' | delta --dark --theme=DarkNeon