Mercurial > hg
view tests/test-commit-unresolved.out @ 8902:b9a8b616521d
Add a forget command for easily untracking files.
This command does exactly what 'hg remove -Af [FILES]' does.
The reason for creating a new command is that the options for 'hg remove'
are confusing (-A removes only deleted files, -f forces deletion, and using
both means *the exact opposite of both*).
[mpm: simplified help text, code, and updated tests]
author | Steve Losh <steve@stevelosh.com> |
---|---|
date | Sun, 31 May 2009 03:09:00 -0400 |
parents | 9fe7e6acf525 |
children | b2310903c462 |
line wrap: on
line source
1 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head % Merging a conflict araises merging A warning: conflicts during merge. merging A failed! 1 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon % Correct the conflict without marking the file as resolved abort: unresolved merge conflicts (see hg resolve) % Mark the conflict as resolved and commit