Mercurial > hg
diff mercurial/commands.py @ 6385:0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Previously, it was possible to commit just one file from a merge, which
is essentially always the wrong thing to do. This fixes issue 1049.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon, 24 Mar 2008 15:36:56 -0700 |
parents | cdc458b12f0f |
children | b8346ae5d64b fb374b1b3911 |
line wrap: on
line diff
--- a/mercurial/commands.py Mon Mar 24 22:49:33 2008 +0100 +++ b/mercurial/commands.py Mon Mar 24 15:36:56 2008 -0700 @@ -539,6 +539,9 @@ If a list of files is omitted, all changes reported by "hg status" will be committed. + If you are committing the result of a merge, do not provide any + file names or -I/-X filters. + If no commit message is specified, the configured editor is started to enter a message.