Download:
Patch
child 285:f78479bd5c63
parent 283:5a3e56f28300
284:49dd141d1cd2
Anton Shestakov <av6@dwimlabs.net>, Sun, 15 Sep 2024 09:20:53 +0400
.hgrc: show merge diffs (experimental, hg 5.8+)
1 файлов изменено, 1 вставок(+), 0 удалений(-) [+]
.hgrc file | annotate | diff | comparison | revisions 
--- a/.hgrc	Sun Sep 15 09:19:17 2024 +0400
+++ b/.hgrc	Sun Sep 15 09:20:53 2024 +0400
@@ -13,6 +13,7 @@
 git = true
 showfunc = true
 word-diff = true
+merge = true
 
 [extensions]
 rebase =