diff options
author | aszlig <aszlig@nix.build> | 2021-07-06 09:06:52 +0200 |
---|---|---|
committer | aszlig <aszlig@nix.build> | 2021-07-09 17:48:27 +0200 |
commit | 710e853a8d7745f606bb840b1e11577c58bb42f2 (patch) | |
tree | 81bbda6b326f7c98f5496a8c5518ba378ce8e9ac /pkgs/aszlig/gopass | |
parent | 709e45c2a8c231201d3f67c6a954021ca2a5f796 (diff) |
workstation: Switch Git conflict style to diff3
I've been using vimdiff3 as the merge tool for a long time, but while it has worked fine for most conflicts, using diff3 makes the original lines visible which I always viewed in a separate shell rather than inline in the editor. Switching this to diff3 should hopefully make merge conflicts more convenient to solve from now on. Signed-off-by: aszlig <aszlig@nix.build>
Diffstat (limited to 'pkgs/aszlig/gopass')
0 files changed, 0 insertions, 0 deletions