Mercurial > public > mercurial-scm > hg
diff hgext/mq.py @ 6613:2f0522ce43b0
merge from crew-stable
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Sat, 17 May 2008 09:12:49 +0200 |
parents | 41eb20cc1c02 088ba40585b9 |
children | de83188043b2 |
line wrap: on
line diff
--- a/hgext/mq.py Wed Apr 23 19:40:15 2008 +0200 +++ b/hgext/mq.py Sat May 17 09:12:49 2008 +0200 @@ -1741,7 +1741,16 @@ return ret def diff(ui, repo, *pats, **opts): - """diff of the current patch""" + """diff of the current patch and subsequent modifications + + Shows a diff which includes the current patch as well as any changes which + have been made in the working directory since the last refresh (thus + showing what the current patch would become after a qrefresh). + + Use 'hg diff' if you only want to see the changes made since the last + qrefresh, or 'hg export qtip' if you want to see changes made by the + current patch without including changes made since the qrefresh. + """ repo.mq.diff(repo, pats, opts) return 0