[PATCH] mergetools: Add Visual Studio Code

danoftheroses at gmail.com danoftheroses at gmail.com
Fri Aug 25 04:15:06 UTC 2023


# HG changeset patch
# User Dan Rose <dan at digilabs.io>
# Date 1692935726 18000
#      Thu Aug 24 22:55:26 2023 -0500
# Node ID 94f9811c39e8d5e6072dd8a3790a561c04fa6dfa
# Parent  b76a938cc9dd3b38389d2d7f965e2b8e56a3a2dc
mergetools: Add Visual Studio Code

diff -r b76a938cc9dd -r 94f9811c39e8 mercurial/defaultrc/mergetools.rc
--- a/mercurial/defaultrc/mergetools.rc	Mon Aug 21 10:00:08 2023 +0200
+++ b/mercurial/defaultrc/mergetools.rc	Thu Aug 24 22:55:26 2023 -0500
@@ -54,6 +54,11 @@
 beyondcompare4.regkeyalt=Software\Wow6432Node\Scooter Software\Beyond Compare 4
 beyondcompare4.regname=ExePath
 
+; Visual Studio Code
+code.args=--wait --merge $other $local $base $output
+code.diffargs=--diff $parent $child
+code.gui=True
+
 diffmerge.args=-nosplash -merge -title1=$labellocal -title2=merged -title3=$labelother $local $base $other -result=$output
 diffmerge.check=changed
 diffmerge.diffargs=--nosplash --title1=$plabel1 --title2=$clabel $parent $child



More information about the Mercurial-devel mailing list