merge: if DELETED_CHANGED and GET are in actions, choose DELETED_CHANGED
ACTION_GET represents that either the file is created on remote or it's newer on
the remote side. However, since we have a ACTION_DELETE_CHANGED too, it means
the file is not present locally and ACTION_GET is representing that file was
created on remote.
Having both ACTION_GET and ACTION_DELETED_CHANGED is conflicting because one
says that file was created on remote and other says file has delete-changed
conflicts.
Let's choose ACTION_DELETED_CHANGED which will result in conflicts and make user
choose the right way forward.
#require cargo test-repo
$ . "$TESTDIR/helpers-testrepo.sh"
$ cd "$TESTDIR"/../rust
Check if Cargo.lock is up-to-date. Will fail with a 101 error code if not.
$ cargo check --locked --all --quiet
However most CIs will run `cargo build` or similar before running the tests, so we need to check if it was modified
$ testrepohg diff