From: Christopher Faylor Date: Wed, 28 Jun 2006 15:06:47 GMT Subject: Re: CFT: merge-recursive in C Message-ID: <20060628150647.GA16935@trixie.casa.cgf.cx> In-Reply-To: <20060626233838.GA3121@steel.home> On Tue, Jun 27, 2006 at 01:38:38AM +0200, Alex Riesen wrote: >It still uses some calls to git programs (git-update-index, >git-hash-object, git-diff-tree and git-write-tree), and merge(1) has >the labels (-L) missing - I was unsure how to tackle this on windows - >it has only argv[1]. Actually, Windows should behave the same as Linux wrt argv handling. You can use argv[1] ... argv[n] modulo any differences in command line quoting. On Windows the arguments are broken into individual components by the runtime, e.g., MSVCRT.dll or Cygwin1.dll. cgf