diff options
Diffstat (limited to '.config')
| -rw-r--r-- | .config/git/config | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.config/git/config b/.config/git/config index 824bd51..4763b50 100644 --- a/.config/git/config +++ b/.config/git/config @@ -6,6 +6,7 @@ [advice] detachedhead = false + mergeconflict = false skippedcherrypicks = false [help] |