Mercurial Mercurial > skel / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Enabled rerere. Keeps database of manually resolved conflicts.
authorOleksandr Gavenko <gavenkoa@gmail.com>
Sun, 21 Mar 2021 01:27:55 +0200
changeset 973 277ccd286936
parent 972 27754771cbb6
child 974 4d731b1de550
Enabled rerere. Keeps database of manually resolved conflicts.
.gitconfig file | annotate | diff | comparison | revisions 
--- a/.gitconfig	Mon Feb 22 20:15:51 2021 +0200
+++ b/.gitconfig	Sun Mar 21 01:27:55 2021 +0200
@@ -59,3 +59,6 @@
 [pull]
 ff = only
 
+[rerere]
+# Reuse Recorded Resolution. Keeps database of manually resolved conflicts.
+enabled = true
skel