From b82036bb3f932e2bffcf466ee7b8e2bebd111760 Mon Sep 17 00:00:00 2001
From: Sam Vente <savente93@proton.me>
Date: Sat, 14 Sep 2024 11:47:34 +0200
Subject: [PATCH] fix merge conflict in cargo.toml

---
 helix-term/Cargo.toml | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 4d2bee853..12724ba4c 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -50,7 +50,7 @@ tokio = { version = "1", features = [
 tui = { path = "../helix-tui", package = "helix-tui", default-features = false, features = [
   "crossterm",
 ] }
-crossterm = { version = "0.27", features = ["event-stream"] }
+crossterm = { version = "0.28", features = ["event-stream"] }
 signal-hook = "0.3"
 tokio-stream = "0.1"
 futures-util = { version = "0.3", features = [
@@ -69,13 +69,14 @@ log = "0.4"
 nucleo.workspace = true
 ignore = "0.4"
 # markdown doc rendering
-pulldown-cmark = { version = "0.11", default-features = false }
+pulldown-cmark = { version = "0.12", default-features = false }
 # file type detection
 content_inspector = "0.2.4"
+thiserror = "1.0"
 
 # opening URLs
-open = "5.1.3"
-url = "2.5.0"
+open = "5.3.0"
+url = "2.5.2"
 
 # config
 toml = "0.8"
@@ -84,15 +85,19 @@ serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 
 # ripgrep for global search
-grep-regex = "0.1.12"
-grep-searcher = "0.1.13"
+grep-regex = "0.1.13"
+grep-searcher = "0.1.14"
 
 [target.'cfg(not(windows))'.dependencies] # https://github.com/vorner/signal-hook/issues/100
 signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
-libc = "0.2.155"
+libc = "0.2.158"
 
 [target.'cfg(target_os = "macos")'.dependencies]
-crossterm = { version = "0.27", features = ["event-stream", "use-dev-tty"] }
+crossterm = { version = "0.28", features = [
+  "event-stream",
+  "use-dev-tty",
+  "libc",
+] }
 
 [build-dependencies]
 helix-loader = { path = "../helix-loader" }
@@ -100,4 +105,5 @@ helix-loader = { path = "../helix-loader" }
 [dev-dependencies]
 smallvec = "1.13"
 indoc = "2.0.5"
-tempfile = "3.10.1"
+tempfile = "3.12.0"
+same-file = "1.0.1"