equal
deleted
inserted
replaced
554 Bad option combinations |
554 Bad option combinations |
555 |
555 |
556 $ hg rollback -q --config ui.rollback=True |
556 $ hg rollback -q --config ui.rollback=True |
557 $ hg uncommit -U --user 'user' |
557 $ hg uncommit -U --user 'user' |
558 abort: cannot specify both --user and --currentuser |
558 abort: cannot specify both --user and --currentuser |
559 [255] |
559 [10] |
560 $ hg uncommit -D --date today |
560 $ hg uncommit -D --date today |
561 abort: cannot specify both --date and --currentdate |
561 abort: cannot specify both --date and --currentdate |
562 [255] |
562 [10] |
563 |
563 |
564 `uncommit <dir>` and `cd <dir> && uncommit .` behave the same... |
564 `uncommit <dir>` and `cd <dir> && uncommit .` behave the same... |
565 |
565 |
566 $ echo 2 > dir/file2.txt |
566 $ echo 2 > dir/file2.txt |
567 $ hg ci -Aqm 'add file2 in directory' |
567 $ hg ci -Aqm 'add file2 in directory' |