git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 0/3] Improvements to mergetool-lib

From
Sebastian Schuberth <sschuberth@gmail.com>
Date
Nov 18, 2010, 10:40 UTC
Message-ID
<4CE50290.90600@gmail.com>

This small series adds Beyond Compare 3 as a diff / merge tool and performs some minor improvements.

Sebastian Schuberth (3):
  mergetool--lib: Sort tools alphabetically for easier lookup
  mergetool--lib: Add Beyond Compare 3 as a tool
  mergetool--lib: Add the proper executable name for ECMerge
 Documentation/git-difftool.txt         |    4 +-
 Documentation/git-mergetool.txt        |    4 +-
 Documentation/merge-config.txt         |    8 +-
 contrib/completion/git-completion.bash |    2 +-
 git-gui/lib/mergetool.tcl              |  101 +++++++------
 git-mergetool--lib.sh                  |  243 +++++++++++++++++---------------
 6 files changed, 195 insertions(+), 167 deletions(-)
-- 
1.7.3.2.msysgit.11
Next: Sebastian Schuberth
Message 1 of 6 in “Improvements to mergetool-lib”
  1. 0/3 Improvements to mergetool-libSebastian Schuberth, Nov 18, 2010
  2. 1/3 mergetool--lib: Sort tools alphabetically for easier lookupSebastian Schuberth, Nov 18, 2010
  3. 2/3 mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth, Nov 18, 2010
  4. 3/3 mergetool--lib: Add the proper executable name for ECMergeSebastian Schuberth, Nov 18, 2010
  5. Charles BaileyNov 18, 2010
  6. Sebastian SchuberthNov 18, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.