diff options
| author | dakkar <dakkar@thenautilus.net> | 2024-05-24 15:41:25 +0100 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2024-05-24 15:41:25 +0100 |
| commit | f6452d0d49e62534b86865dbb33d4503e9148b43 (patch) | |
| tree | 34b6fe8f6e3b70b8c5e4eef2d24f384e23a8fc94 | |
| parent | less aggressive killmerged (diff) | |
| download | dotfiles-f6452d0d49e62534b86865dbb33d4503e9148b43.tar.gz dotfiles-f6452d0d49e62534b86865dbb33d4503e9148b43.tar.bz2 dotfiles-f6452d0d49e62534b86865dbb33d4503e9148b43.zip | |
zdiff3 is prettier
| -rw-r--r-- | .gitconfig | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -37,7 +37,7 @@ renames = copies colorMoved = zebra [merge] - conflictstyle = diff3 + conflictstyle = zdiff3 [log] decorate = short date = iso |