Mercurial > hg
view tests/test-merge-remove.out @ 10014:54cd28258ea7
status: add the --change option to display files changed in a revision
This option is similar to the one already used for the diff command.
Unfortunately, the c and C short option are already used for status, so there
is no corresponding short option. However, there is no short option for --rev
either, so that's consistent.
author | Gilles Moris <gilles.moris@free.fr> |
---|---|
date | Mon, 30 Nov 2009 23:51:06 +0100 |
parents | 369ddc9c0339 |
children |
line wrap: on
line source
created new head merging foo1 and foo to foo1 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) n 0 -2 bar m 644 14 foo1 copy: foo -> foo1 M bar M foo1 % removing foo1 and bar r 0 -2 bar r 0 -1 foo1 copy: foo -> foo1 R bar R foo1 % readding foo1 and bar adding bar adding foo1 n 0 -2 bar m 644 14 foo1 copy: foo -> foo1 M bar M foo1 foo % reverting foo1 and bar saving current version of bar as bar.orig reverting bar saving current version of foo1 as foo1.orig reverting foo1 n 0 -2 bar m 644 14 foo1 copy: foo -> foo1 M bar M foo1 foo