[darcs-devel] confusing hunk patch
David Roundy
droundy at abridgegame.org
Sun May 8 04:33:07 PDT 2005
On Sun, May 08, 2005 at 04:30:16AM -0700, Tupshin Harper wrote:
> One last question for now. Can a merge ever consist of anything other
> than hunks? I'm guessing yes in theory, but no in current
> implementation, but I could easily be wrong about either.
I presume you mean a merger? Yes, it can have pretty much any sorts of
patches in it--e.g. if one person tries to add a file and another adds a
directory with the same name.
--
David Roundy
http://www.darcs.net
More information about the darcs-devel
mailing list