diff options
Diffstat (limited to 'tools/conf/etc/skel/.gitconfig')
| -rw-r--r-- | tools/conf/etc/skel/.gitconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/conf/etc/skel/.gitconfig b/tools/conf/etc/skel/.gitconfig index f96ecf7..730d8d9 100644 --- a/tools/conf/etc/skel/.gitconfig +++ b/tools/conf/etc/skel/.gitconfig @@ -1,8 +1,10 @@ [core] pager = less -F -X + editor = vim [diff] tool = vimdiff [merge] tool = vimdiff + conflictstyle = diff3 [difftool] prompt = false |