From cda9d2b911a2aaa41887b202fe185ddd88dbf328 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Mon, 7 Oct 2024 18:00:00 +0200 Subject: common/git: sort paths of jj diffs --- common/commandline/git.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'common') diff --git a/common/commandline/git.nix b/common/commandline/git.nix index f3ba3e8..24babd7 100644 --- a/common/commandline/git.nix +++ b/common/commandline/git.nix @@ -101,6 +101,7 @@ _inputs: merge-tools = { difft.diff-args = [ "--color=always" + "--sort-paths" "$left" "$right" ]; -- cgit v1.2.3