From: Johannes Schindelin <johannes.schindelin@gmx.de>
To: David Aguilar <davvid@gmail.com>
Cc: Phil Susi <phillsusi@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Philip Oakley <philipoakley@iee.org>,
git@vger.kernel.org
Subject: Re: [PATCH] mergetools: add winmerge as a builtin tool
Date: Tue, 12 May 2015 17:03:51 +0200 [thread overview]
Message-ID: <f44bed1d712b4be11ee143cc33ef0bb1@www.dscho.org> (raw)
In-Reply-To: <1431422977-61243-1-git-send-email-davvid@gmail.com>
Hi David,
On 2015-05-12 11:29, David Aguilar wrote:
> + # Look for WinMergeU.exe in the typical locations
> + winmerge_exe="WinMerge/WinMergeU.exe"
> + if test -n "$PROGRAMFILES" && test -x "$PROGRAMFILES/$winmerge_exe"
> + then
> + printf '%s' "$PROGRAMFILES/$winmerge_exe"
> + elif test -x "/c/Program Files (x86)/$winmerge_exe"
At this stage you probably want to look for "$ProgramW6432" first.
> + then
> + printf '%s' "/c/Program Files (x86)/$winmerge_exe"
> + elif test -x "/c/Program Files/$winmerge_exe"
> + then
> + printf '%s' "/c/Program Files/$winmerge_exe"
> + else
> + echo WinMergeU.exe
> + fi
> +}
Ciao,
Johannes
prev parent reply other threads:[~2015-05-12 15:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-12 9:29 [PATCH] mergetools: add winmerge as a builtin tool David Aguilar
2015-05-12 15:03 ` Johannes Schindelin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f44bed1d712b4be11ee143cc33ef0bb1@www.dscho.org \
--to=johannes.schindelin@gmx.de \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=philipoakley@iee.org \
--cc=phillsusi@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).