mirror of
https://github.com/martinvonz/jj.git
synced 2025-05-30 03:21:12 +00:00
7a7f76cbfb
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