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>

0 files changed, 0 insertions, 0 deletions