fix merge

helix-editor · Jan 16, 2024 · 4c292d0 · 4c292d0
1 parent af53445
commit 4c292d0
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/helix-core/src/history.rs b/helix-core/src/history.rs
@@ -293,7 +293,10 @@ impl History {
                 NonZeroUsize::new(other.revisions.len());
             other.revisions.push(r);
         }
-        self.current += offset;
+
+        if self.current >= n {
+            self.current += offset;
+        }
         self.revisions = other.revisions;
 
         Ok(())