From 2de3c0867ad3a05ec9a1bb281c6d6fa2c9d91a21 Mon Sep 17 00:00:00 2001 From: Barrett Ruth <62671086+barrettruth@users.noreply.github.com> Date: Mon, 16 Mar 2026 15:06:40 -0400 Subject: [PATCH] docs(upstream): consolidate #85 into #121 (#144) Problem: upstream issue #85 (git status column) was still marked open. This is tracked by our git integration issue #121. Solution: mark as consolidated into #121, alongside the previously consolidated #571. --- doc/upstream.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/upstream.md b/doc/upstream.md index 055dd92..b032e28 100644 --- a/doc/upstream.md +++ b/doc/upstream.md @@ -34,7 +34,7 @@ issues against this fork. | Issue | Description | Status | | ------------------------------------------------------- | ---------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| [#85](https://github.com/stevearc/oil.nvim/issues/85) | Git status column | open | +| [#85](https://github.com/stevearc/oil.nvim/issues/85) | Git status column | consolidated into [#121](https://github.com/barrettruth/canola.nvim/issues/121) | | [#95](https://github.com/stevearc/oil.nvim/issues/95) | Undo after renaming files | open | | [#117](https://github.com/stevearc/oil.nvim/issues/117) | Move file into new dir via slash in name | open | | [#156](https://github.com/stevearc/oil.nvim/issues/156) | Paste path of files into oil buffer | open |