X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=TODO.BRANCH;h=a8f5deb5230eb947eea3dcd55f033e315dd4003c;hp=81872b3b0a89d5da5e7530eda5e7624238699be2;hb=57fe9181f58d6a311dd105283eff2be055de26b6;hpb=64d159f5dd06cbe512cfb534a8391d691b30ec6c diff --git a/TODO.BRANCH b/TODO.BRANCH index 81872b3b..a8f5deb5 100644 --- a/TODO.BRANCH +++ b/TODO.BRANCH @@ -5,7 +5,7 @@ We want a --overwrite=VERSION option which 1. adjusts the version used above, and 2. does the same thing in any - quilt mode. If no split brain it should make the psuedomerge + quilt mode. If no split brain it should make the pseudomerge on the user's HEAD.