changeset
Cleaner conflict resolution
Thu, 16 Mar 2023 12:30:54 -0500
- author
- Meredith Howard <mhoward@roomag.org>
- date
- Thu, 16 Mar 2023 12:30:54 -0500
- changeset 1089
- 81b964cde5b9
- parent 1088
- c221227cbba5
- child 1090
- a9da52816a33
Cleaner conflict resolution
| .gitconfig | file | annotate | diff | comparison | revisions |
--- a/.gitconfig +++ b/.gitconfig @@ -1,3 +1,4 @@ +# vim: noet:ts=8:sw=8 [user] email = mhoward@roomag.org name = Meredith Howard @@ -50,6 +51,10 @@ guitool = gvimdiff conflictstyle = diff3 +[mergetool] + keepBackup = false + hideResolved = true + [branch] autosetupmerge = always @@ -84,5 +89,3 @@ # include.path is available in git 1.7.10 and later [include] path = ~/.gitconfig.local - -# vim: noet:ts=8:sw=8
