merge from crew-stable

This commit is contained in:
Dirkjan Ochtman 2008-04-16 09:36:24 +02:00
commit 61c882a737

View File

@ -1902,7 +1902,10 @@ def savename(path):
return newpath
def push(ui, repo, patch=None, **opts):
"""push the next patch onto the stack"""
"""push the next patch onto the stack
When --force is applied, all local changes in patched files will be lost.
"""
q = repo.mq
mergeq = None