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

Re: [PATCH 6/8] sh-tools: add a run_merge_tool function

From
Markus Heidelberg <markus.heidelberg@web.de>
Date
Mar 30, 2009, 07:32 UTC
Message-ID
<200903300932.29870.markus.heidelberg@web.de>
In-Reply-To
<1238389428-69328-7-git-send-email-davvid@gmail.com>
David Aguilar, 30.03.2009:
Show 9 quoted lines
> +# Runs a side-by-side merge tool
> +run_merge_tool()
> +{
> +	merge_tool="$1"
> +
> +	# base_present is always false when !mergetool_mode
> +	case "$merge_tool" in
> +	kdiff3)
> [...]

Kompare is missing here. Note, that this is only diff tool, not for merges.

Markus
Previous: Markus HeidelbergNext: David Aguilar
Message 11 of 19 in “(unknown)”
  1. David AguilarMar 30, 2009
  2. 1/8 mergetool: use tabs consistentlyDavid Aguilar, Mar 30, 2009
  3. 2/8 mergetool: use $( ... ) instead of `backticks`David Aguilar, Mar 30, 2009
  4. 3/8 sh-tools: add a git-sh-tools shell helper scriptDavid Aguilar, Mar 30, 2009
  5. 4/8 mergetool: refactor git-mergetool to use git-sh-toolsDavid Aguilar, Mar 30, 2009
  6. 5/8 difftool: refactor git-difftool to use git-sh-toolsDavid Aguilar, Mar 30, 2009
  7. 6/8 sh-tools: add a run_merge_tool functionDavid Aguilar, Mar 30, 2009
  8. 7/8 mergetool: refactor git-mergetool to use run_merge_toolDavid Aguilar, Mar 30, 2009
  9. 8/8 difftool: refactor git-difftool-helper to use run_merge_toolDavid Aguilar, Mar 30, 2009
  10. Markus HeidelbergMar 30, 2009
  11. Markus HeidelbergMar 30, 2009
  12. David AguilarMar 30, 2009
  13. Junio C HamanoMar 30, 2009
  14. David AguilarMar 30, 2009
  15. Charles BaileyMar 30, 2009
  16. David AguilarMar 31, 2009
  17. Junio C HamanoApr 1, 2009
  18. Markus HeidelbergMar 30, 2009
  19. Junio C HamanoMar 30, 2009

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.