diff options
Diffstat (limited to 'nix-conf')
| -rw-r--r-- | nix-conf/home/includes/common.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nix-conf/home/includes/common.nix b/nix-conf/home/includes/common.nix index acae580..17d9a0d 100644 --- a/nix-conf/home/includes/common.nix +++ b/nix-conf/home/includes/common.nix @@ -329,6 +329,7 @@ in cmd = ''difft "$LOCAL" "$REMOTE"''; }; }; + merge.conflictstyle = "diff3"; pull = { ff = "only"; rebase = false; |