| $ poetry install --no-root -vvv | |
| Using virtualenv: /home/ilyagr/.cache/pypoetry/virtualenvs/jj-docs-ZVbGoaMc-py3.11 | |
| Installing dependencies from lock file | |
| Warning: poetry.lock is not consistent with pyproject.toml. You may be getting improper dependencies. Run `poetry lock [--no-update]` to fix it. | |
| Finding the necessary packages for the current system | |
| Package operations: 0 installs, 1 update, 0 removals, 36 skipped | |
| • Installing babel (2.13.1): Pending... |
| [merge] | |
| conflictstyle = diff3 | |
| tool = three_meld | |
| [mergetool "three_meld"] | |
| # Opens up four diff windows: | |
| # LOCAL:MERGED, BASE:LOCAL, BASE:REMOTE, LOCAL:REMOTE | |
| # | |
| # Lets you edit the MERGED file (including original diff3 markers), showing | |
| # you the final diff from LOCAL. For reference, you can look in the other | |
| # windows to see how LOCAL and REMOTE are each different from BASE, as well |
vimdiff comes as a pre-configured merge tool for jj
and can be used with jj resolve out of the box. However, the default configuration for
vimdiff as a diff editor (for jj split, etc.) is barely useable.
To more conveniently use Vim as a difftool for jj, try one of the following setups:
DirDiff Vim plugin.
| # This file is machine-generated - editing it directly is not advised | |
| [[AbstractFFTs]] | |
| deps = ["LinearAlgebra"] | |
| git-tree-sha1 = "051c95d6836228d120f5f4b984dd5aba1624f716" | |
| uuid = "621f4979-c628-5d54-868e-fcf4e3e8185c" | |
| version = "0.5.0" | |
| [[Adapt]] | |
| deps = ["LinearAlgebra"] |
| <html><body><script type="module"> | |
| import { html, render } from "https://unpkg.com/lit-html@1.1.0?module"; | |
| function _selector(values) { | |
| return html` | |
| <select> | |
| <option value="">Choose one:</option> | |
| ${values.map( | |
| k => |