diff --git a/packages.nix b/packages.nix index 405fcde..cf43791 100644 --- a/packages.nix +++ b/packages.nix @@ -81,6 +81,7 @@ meld glab sapling + difftastic firefox vivaldi diff --git a/programs/git.nix b/programs/git.nix index c0f6e56..5419df9 100644 --- a/programs/git.nix +++ b/programs/git.nix @@ -37,6 +37,7 @@ diff.colorMoved = "default"; merge.tool = "meld"; + diff.external = "difft"; diff.algorithm = "patience"; pull.ff = "only"; credential.helper = "store";