diff options
| author | David Morgan <djm_uk@protonmail.com> | 2024-10-25 12:51:24 +0100 |
|---|---|---|
| committer | David Morgan <djm_uk@protonmail.com> | 2024-10-25 12:51:24 +0100 |
| commit | 29bb0340b7e1205657423d5a85d8b612298a3152 (patch) | |
| tree | 8348908cc4d5858dc5f7e17ebd939e29644062da /nix-conf | |
| parent | 301f3d263181bf39ee1770c87508340bcfb1fbe5 (diff) | |
| download | dotfiles-29bb0340b7e1205657423d5a85d8b612298a3152.tar.gz | |
Try diff3 conflict style again
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; |