[PATCH] mergetools: Add Visual Studio Code

[danoftheroses]

# HG changeset patch
# User Dan Rose 
# 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

___
Mercurial-devel mailing list
Mercurial-devel@lists.mercurial-scm.org
https://lists.mercurial-scm.org/mailman/listinfo/mercurial-devel

[Bug 6842] New: Is JetBlue Safe

[mercurial-bugs]

https://bz.mercurial-scm.org/show_bug.cgi?id=6842

Bug ID: 6842
   Summary: Is JetBlue Safe
   Product: Mercurial project
   Version: unspecified
  Hardware: PC
   URL: https://travelraval.com/blog/is-jetblue-safe-to-fly/
OS: Windows
Status: UNCONFIRMED
  Severity: feature
  Priority: wish
 Component: website
  Assignee: bugzi...@mercurial-scm.org
  Reporter: nancyrgalindonan...@gmail.com
CC: mercurial-de...@mercurial-scm.org

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
Mercurial-devel mailing list
Mercurial-devel@lists.mercurial-scm.org
https://lists.mercurial-scm.org/mailman/listinfo/mercurial-devel