1 files changed, 1 insertions, 0 deletions
diff --git a/programs/git.nix b/programs/git.nix
index e4b5e0f..69dd409 100644
--- a/programs/git.nix
+++ b/programs/git.nix
@@ -67,6 +67,7 @@ with theme;
        enabled = true;
        autoUpdate = true;
      };
+      merge.conflictstyle = "diff3";
    };
  };
 }

diff --git a/programs/git.nix b/programs/git.nix index e4b5e0f..69dd409 100644 --- a/programs/git.nix +++ b/programs/git.nix
@@ -67,6 +67,7 @@ with theme;
67	enabled = true;	67	enabled = true;
68	autoUpdate = true;	68	autoUpdate = true;
69	};	69	};
		70	merge.conflictstyle = "diff3";
70	};	71	};
71	};	72	};
72	}	73	}