2013/6/21, Ivan Zakharyaschev <[email protected]>: > I see, so the manual is supposed to be part of the main darcs source code.
Oh, as I could see now (since I haven't been into darcs development, I couldn't know this before), the bits of the manual I wanted to modify used to come from the darcs code before, too. This note about external merge tools used to be in Resolution.lhs -- http://hackage.haskell.org/packages/archive/darcs/2.5.2/doc/html/src/Darcs-Resolution.html . Where should it belong now to? To Resolution.hs? Or simply it shoud be added and left in the wiki, because the manual in the future releases probably will lack these notes on external merge tools? > Actually, I wanted to make a note on calling Emacs directly as the > merge tool (with ugly shell programming to construct the Elisp > expression). I'm attaching it. > > But this piece of manual (mentioning Emacs) seems not to be present in > the current darcs source in any form. > > I've also prepared a longer hint/tip about this for darcs-wiki, but I > did this in the cloned repo of the wiki. That's why I asked about > untrusted pushes to the wiki, which could be a convenient feature. Best wishes, -- Ivan _______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
