On Oct 9, 2007, at 2:37 PM, Johannes Schindelin wrote:
On Tue, 9 Oct 2007, Steffen Prohaska wrote:
I work on the msysgit project and I'd like to have mergetool
available
before I advertise git on Windows. It makes merging so much easier ;)
I would _hate_ to rely on a closed source program (in addition to
Windows
itself) in msysGit.
It's only an option. You can also choose kdiff3 if you like, or
vimdiff or
emacs merge. But personally, I prefer ECMerge because is seems to
support
a faster and safer workflow (at least for me).
Before submitted this patch I thought about a general mechanism to
easily
specify any tool that supports command line argument. But just adding
them
tool by tool as needed looks easier to me, and hopefully to the user. We
can include the correct command line in git-mergetool and only require
the location of the program from the user.
And it seems that you cannot even get ECMerge for free in general.
True. But does it matter? I can't get Windows for free and git runs
on it.
What does TortoiseCVS use?
Don't know.
Steffen
-
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
