Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Meta issue] Integration in @jupyterlab/git #680

Closed
2 tasks done
fcollonval opened this issue Sep 18, 2023 · 1 comment
Closed
2 tasks done

[Meta issue] Integration in @jupyterlab/git #680

fcollonval opened this issue Sep 18, 2023 · 1 comment

Comments

@fcollonval
Copy link
Collaborator

fcollonval commented Sep 18, 2023 •
edited
Loading

This is a meta issue to list actions required on nbdime for @jupyterlab/git based on CodeMirror 6:

Tasks
Preview Give feedback
  1. Support merge view with 3 panels (theirs | final | ours) in addition to the current 4 panels views #682
    fcollonval
  2. Converge on API to be able to reuse nbdime diff and merge widgets for plain text in @jupyterlab/git #681
    fcollonval
@fcollonval fcollonval mentioned this issue Sep 18, 2023
Merged
@fcollonval
Copy link
Collaborator Author

Closing as completed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@fcollonval