diff hgrc/hgrc-Windows_NT @ 504:015e94f44cc0

Merged changes.
author Ludovic Chabant <ludovic@chabant.com>
date Wed, 30 Sep 2020 21:17:47 -0700
parents 36300968dc55
children
line wrap: on
line diff
--- a/hgrc/hgrc-Windows_NT	Mon Apr 20 16:24:08 2020 -0700
+++ b/hgrc/hgrc-Windows_NT	Wed Sep 30 21:17:47 2020 -0700
@@ -1,12 +1,12 @@
-[ui]
-ssh = "%USERPROFILE%\scoop\shims\plink.exe" -ssh -2 -batch -C
-editor = "C:\Program Files (x86)\Vim\vim80\vim.exe"
-
-[extdiff]
-cmds.wdiff = "C:\Program Files (x86)\WinMerge\WinMergeU.exe"
-
-[tortoisehg]
-editor = "C:\Program Files (x86)\Notepad++\notepad++.exe"
-vdiff = "C:\Program Files (x86)\WinMerge\WinMergeU.exe"
-
-# vim: ft=cfg
+[ui]
+ssh = "%USERPROFILE%\scoop\shims\plink.exe" -ssh -2 -batch -C
+editor = "%USERPROFILE%\scoop\shims\vim.exe"
+
+[extdiff]
+cmds.wdiff = "C:\Program Files (x86)\WinMerge\WinMergeU.exe"
+
+[tortoisehg]
+editor = "C:\Program Files (x86)\Notepad++\notepad++.exe"
+vdiff = "C:\Program Files (x86)\WinMerge\WinMergeU.exe"
+
+# vim: ft=cfg