Re: configure names for temporary files

2014-10-10 Thread Sergio Ferrero
Ok. thanks! David: I'm pretty sure matlab won't do that change soon :) Sergio On Wed, Oct 8, 2014 at 2:25 PM, Junio C Hamano wrote: > David Aguilar writes: > >> In any case, it might be worth adjusting mergetool to use a more >> conservative path (underscores instead of dots) since there >> doe

Re: configure names for temporary files

2014-10-08 Thread Junio C Hamano
David Aguilar writes: > In any case, it might be worth adjusting mergetool to use a more > conservative path (underscores instead of dots) since there > doesn't seem to be much downside to doing so. Hopefully there won't be tools that reject paths with "_" in them ;-) -- To unsubscribe from this

Re: configure names for temporary files

2014-10-08 Thread David Aguilar
On Tue, Oct 07, 2014 at 11:33:16AM -0300, Sergio Ferrero wrote: > Hello, > > I'd like to configure git with a specific merge tool to merge Simulink > model files. > I have followed the steps to configure the merge tool successfully. > > I typed the following on Git Bash: > >git config --syst

configure names for temporary files

2014-10-07 Thread Sergio Ferrero
Hello, I'd like to configure git with a specific merge tool to merge Simulink model files. I have followed the steps to configure the merge tool successfully. I typed the following on Git Bash: git config --system mergetool..cmd '"" -base "$BASE" -local "$LOCAL" -remote "$REMOTE" -merged "$ME