summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common/commandline/git.nix1
1 files changed, 1 insertions, 0 deletions
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:
101 merge-tools = { 101 merge-tools = {
102 difft.diff-args = [ 102 difft.diff-args = [
103 "--color=always" 103 "--color=always"
104 "--sort-paths"
104 "$left" 105 "$left"
105 "$right" 106 "$right"
106 ]; 107 ];