Austin Seipp 7a7f76cbfb cli: deprecate jj merge ... Summary: As discussed in Discord, on GitHub, and elsewhere, this change deprecates the use of `jj merge` and suggests users use `jj new` exclusively instead. `merge` isn't completely unfit as a name; but we think it obscures the generality of `new` and we want people to use it instead. To further drive the bit home, by default, `jj merge` is now hidden. This will hopefully stop new users from running into it. Signed-off-by: Austin Seipp <aseipp@pobox.com> Change-Id: I94938aca9d3e2aa12d1394a5fbc58acce3185b56		2024-02-03 17:21:56 -06:00
..
examples	backend: pass Index and keep_newer timestamp parameters to gc()	2024-01-27 10:18:11 +09:00
src	cli: deprecate jj merge	2024-02-03 17:21:56 -06:00
testing	fake_diff_editor: Allow specifying extra arguments to be ignored	2023-08-21 20:19:15 -07:00
tests	cli: deprecate jj merge	2024-02-03 17:21:56 -06:00
build.rs	build: update rerun-if conditions to watch .git/HEAD in colocated repo	2023-08-06 12:16:11 +09:00
Cargo.toml	cli: new jj util markdown-help outputs jj help for all commands	2024-01-30 14:58:32 -08:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00