-
Notifications
You must be signed in to change notification settings - Fork 160
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
8130af2
commit bfb22da
Showing
12 changed files
with
0 additions
and
0 deletions.
There are no files selected for viewing
Binary file modified
BIN
-10.4 KB
(72%)
ui-tests/tests/nbdime-merge-test1.spec.ts-snapshots/3-panels-view-1-linux.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-13.8 KB
(72%)
...1.spec.ts-snapshots/merge-test1-choose-central-version-for-conflict-1-linux.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-13.8 KB
(72%)
...est1.spec.ts-snapshots/merge-test1-choose-left-version-for-conflict-1-linux.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-13.8 KB
(72%)
...st1.spec.ts-snapshots/merge-test1-choose-right-version-for-conflict-1-linux.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-13.8 KB
(72%)
...erge-test1.spec.ts-snapshots/merge-test1-take-a-snapshot-at-opening-1-linux.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-13.8 KB
(72%)
...me-merge-test2.spec.ts-snapshots/merge-test2-choose-central-version-1-linux.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-13.8 KB
(72%)
...bdime-merge-test2.spec.ts-snapshots/merge-test2-choose-left-version-1-linux.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-13.8 KB
(72%)
...dime-merge-test2.spec.ts-snapshots/merge-test2-choose-right-version-1-linux.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-13.8 KB
(72%)
...erge-test2.spec.ts-snapshots/merge-test2-take-a-snapshot-at-opening-1-linux.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-21 KB
(70%)
...s/merge-test4-should-synchronize-the-collapse-status-between-editor-1-linux.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-66.8 KB
(67%)
...erge-test5.spec.ts-snapshots/merge-test5-take-a-snapshot-at-opening-1-linux.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+568 Bytes
(100%)
...erge-test6.spec.ts-snapshots/merge-test6-take-a-snapshot-at-opening-1-linux.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.