Support merge view with 3 panels (theirs | final | ours) in addition to the current 4 panels views #682
Assignees
Comments
fcollonval
added a commit
to fcollonval/nbdime
that referenced
this issue
Sep 28, 2023
…to the current 4 panels views Fixes jupyter#682
fcollonval
added a commit
to fcollonval/nbdime
that referenced
this issue
Sep 29, 2023
…to the current 4 panels views Fixes jupyter#682
fcollonval
added a commit
to fcollonval/nbdime
that referenced
this issue
Oct 3, 2023
…to the current 4 panels views Fixes jupyter#682
fcollonval
added a commit
to fcollonval/nbdime
that referenced
this issue
Oct 10, 2023
…to the current 4 panels views Fixes jupyter#682
fcollonval
added a commit
that referenced
this issue
Oct 10, 2023
* Add ability to set showBase from CLI option * Use DiffPanel for diff widgets * Support merge view with 3 panels (theirs | final | ours) in addition to the current 4 panels views Fixes #682 * Add integration tests * Fix diff views * Lint the code * Fix final padding for merged editor in 3-panels view * Fix scroll synchronization for 3-panels view * Update Playwright Snapshots * Update Playwright Snapshots * Add delay to improve test robustness on Windows * Change expectation --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
In
@jupyterlab/git, the merge addon from CM5 was used directly to display merge views for plain text using a 3 panels view:theirs | final | ours. It will be nice to add a setting in nbdime widget to select either the current 4 panels view or that 3 panel view.The text was updated successfully, but these errors were encountered: