hgbook
diff en/mq-collab.tex @ 286:f992b16d18a1
hg-interdiff: handle single-file diffs
author | Nicholas Riley <njriley@uiuc.edu> |
---|---|
date | Sun Jan 13 08:16:21 2008 -0800 (2008-01-13) |
parents | 4119e57679f7 |
children | 5561812fc5c9 |
line diff
1.1 --- a/en/mq-collab.tex Sun May 27 09:52:53 2007 -0700 1.2 +++ b/en/mq-collab.tex Sun Jan 13 08:16:21 2008 -0800 1.3 @@ -261,7 +261,7 @@ 1.4 \item ``Accepted'' patches are guarded with \texttt{accepted}. I 1.5 enable this guard most of the time. When I'm applying the patches 1.6 on top of a tree where the patches are already present, I can turn 1.7 - this patch off, and the paptches that follow it will apply cleanly. 1.8 + this patch off, and the patches that follow it will apply cleanly. 1.9 \item Patches that are ``finished'', but not yet submitted, have no 1.10 guards. If I'm applying the patch stack to a copy of the upstream 1.11 tree, I don't need to enable any guards in order to get a reasonably