git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b52612e)
mergetools: use the correct tool for Beyond Compare 3 on Windows
authorPat Thoyts <redacted>
Sat, 15 Oct 2011 14:05:19 +0000 (15:05 +0100)
committerJunio C Hamano <redacted>
Sun, 16 Oct 2011 03:13:55 +0000 (20:13 -0700)
commit8850c3da95d17bb23576ee5ee3484bfd3d486444
tree5a5f2932d9dad947e379f6ede60cd75b498a26batree | snapshot
parentb52612ed4f736c517231954ef0d765add1fe29b7commit | diff
mergetools: use the correct tool for Beyond Compare 3 on Windows

On Windows the bcompare tool launches a graphical program and does
not wait for it to terminate. A separate 'bcomp' tool is provided which
will wait for the view to exit so we use this instead.

Reported-by: Werner BEROUX <redacted>
Signed-off-by: Pat Thoyts <redacted>
Signed-off-by: Junio C Hamano <redacted>
mergetools/bc3 diff | blob | history
git clone https://git.99rst.org/PROJECT