mirror of
https://github.com/git/git.git
synced 2024-05-07 02:16:09 +02:00
3e4f2373b2
Add a winmerge scriptlet with the commands described in [1] so that users can use winmerge without needing to perform any additional configuration. [1] http://thread.gmane.org/gmane.comp.version-control.git/268631 Helped-by: Philip Oakley <philipoakley@iee.org> Helped-by: Johannes Schindelin <johannes.schindelin@gmx.de> Helped-by: Sebastian Schuberth <sschuberth@gmail.com> Helped-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> |
||
|---|---|---|
| .. | ||
| araxis | ||
| bc | ||
| bc3 | ||
| codecompare | ||
| deltawalker | ||
| diffmerge | ||
| diffuse | ||
| ecmerge | ||
| emerge | ||
| gvimdiff | ||
| gvimdiff2 | ||
| gvimdiff3 | ||
| kdiff3 | ||
| kompare | ||
| meld | ||
| opendiff | ||
| p4merge | ||
| tkdiff | ||
| tortoisemerge | ||
| vimdiff | ||
| vimdiff2 | ||
| vimdiff3 | ||
| winmerge | ||
| xxdiff | ||