ok/jj
1
0
Fork 0
forked from mirrors/jj
jj/lib
Martin von Zweigbergk b80c39d77c view: test that merging divergent rewrites results in both commits visible
It seems that we didn't have a test for this simple case. I wrote this
test case while working on #111 but I don't know why I didn't push it
back then.
2022-12-01 19:20:38 -08:00
..
src git: do not delete or track git submodules. 2022-12-01 23:14:55 +05:30
tests view: test that merging divergent rewrites results in both commits visible 2022-12-01 19:20:38 -08:00
testutils copyright: change from "Google LLC" to "The Jujutsu Authors" 2022-11-28 06:05:45 -10:00
build.rs copyright: change from "Google LLC" to "The Jujutsu Authors" 2022-11-28 06:05:45 -10:00
Cargo.toml cargo: bump insta from 1.21.1 to 1.21.2 2022-11-28 05:29:03 -10:00