Hi, On Tue, 23 Jan 2007, Linus Torvalds wrote: > On Tue, 23 Jan 2007, Johannes Schindelin wrote: > > > > Yes. But it _does_ have a dependency on perl and bash. For example, when > > you merge git-merge-one-file is spawned -- a bash script. > > That's just disgusting. I thought we fixed it, but apparently we only did > so for git-merge-recursive. Hmm? > > All the other uses seem to be just a case of > > git-merge-index -o git-merge-one-file -a > > and wouldn't it be beautiful if the default action for git-merge-index (if > you do _not_ specify a merger program) was to do the simple one-file > three-way merge that we can already do for real merges? If you think that's a new dream: http://article.gmane.org/gmane.comp.version-control.git/32046/match=git-merge-one-file Ciao, Dscho - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html