On Oct 9, 2007, at 12:43 PM, Johannes Schindelin wrote: > Hi, > > On Mon, 8 Oct 2007, Benoit SIGOURE wrote: > >> [as usual, I forgot the attachment...] > > Two comments: > > - by not inlining you made it hard to review your script. Therefore I > will not do it. :| > > - Try to avoid naming the script git-merge-*; these scripts/ > programs are > merge _strategies_, not merge _drivers_ (and yes, we already have > two > programs violating this rule -- merge-base and merge-file -- but > that > does not mean that you are free to add to the pile). I'm open to better suggestions. Cheers, -- Benoit Sigoure aka Tsuna EPITA Research and Development Laboratory