On Wed, Mar 28, 2012 at 4:02 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > > That is even worse, no? Is the rest of the code prepared to give you "git > difftool -t baz" in such a layout? What if you have another baz next to > foo and bar? > > What I was hinting at was that you may want to $File::Find::prune=1 when > you find a subdirectory. While at it, you may also want to replace > the "unless -d $_" with "if -f $_ && -x _" or something. I see now...sorry I missed your obvious point. I will look into this further. The script makes some assumptions right now: 1) All tool config scripts must be located in "$(git --exec-path)/mergetools". 2) There is only one tool config in each script - See my other other recent patch that splits vim/gvim [1] 3) The name of the tool script matches the name of the tool itself. Do these assumptions seem reasonable? If so, perhaps I should add a README to the mergetools directory that outlines these assumptions? [1]: http://thread.gmane.org/gmane.comp.version-control.git/194179 -- 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