Mercurial > evolve
diff tests/test-fixup.t @ 6936:a239ea1dfacb default tip
branching: merge with stable
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 22 Nov 2024 16:53:42 +0400 |
| parents | 237f99ee3d64 |
| children |
line wrap: on
line diff
--- a/tests/test-fixup.t Sat Oct 26 11:19:50 2024 +0400 +++ b/tests/test-fixup.t Fri Nov 22 16:53:42 2024 +0400 @@ -12,6 +12,7 @@ > git = 1 > EOF +#if hg69 $ hg help fixup hg fixup [OPTION]... [-r] REV @@ -19,22 +20,22 @@ add working directory changes to an arbitrary revision - A new changeset will be created, superseding the one specified. The new - changeset will combine working directory changes with the changes in the - target revision. + A new changeset will be created, superseding the one specified. The new + changeset will combine working directory changes with the changes in the + target revision. - This operation requires the working directory changes to be relocated onto - the target revision, which might result in merge conflicts. + This operation requires the working directory changes to be relocated onto the + target revision, which might result in merge conflicts. - If fixup is interrupted to manually resolve a conflict, it can be - continued with --continue/-c, or aborted with --abort. + If fixup is interrupted to manually resolve a conflict, it can be continued + with --continue/-c, or aborted with --abort. - Note that this command is fairly new and its behavior is still - experimental. For example, the working copy will be left on a temporary, - obsolete commit containing the fixed-up changes after the operation. This - might change in the future. + Note that this command is fairly new and its behavior is still experimental. + For example, the working copy will be left on a temporary, obsolete commit + containing the fixed-up changes after the operation. This might change in the + future. - Returns 0 on success, 1 if nothing changed. + Returns 0 on success, 1 if nothing changed. options: @@ -43,6 +44,7 @@ --abort abort an interrupted fixup (some details hidden, use --verbose to show complete help) +#endif Simple cases ------------