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

git-mergetool

From
MUMattias Ulbrich <mulbrich@ira.uka.de>
Date
Sep 28, 2007, 08:56 UTC
Message-ID
<200709281056.15844.mulbrich@ira.uka.de>
Hello everybody,
There might by a tiny typo-bug in the git-mergetool:
-----------
 case "$merge_tool" in
	kdiff3)
	    if base_present ; then
		(kdiff3 --auto --L1 "$path (Base)" -L2 "$path (Local)" --L3 "$path (Remote)" 
\
		    -o "$path" -- "$BASE" "$LOCAL" "$REMOTE" > /dev/null 2>&1)
	    else
		(kdiff3 --auto -L1 "$path (Local)" --L2 "$path (Remote)" \
		    -o "$path" -- "$LOCAL" "$REMOTE" > /dev/null 2>&1)
	    fi
-----------

In the first call to kdiff3 the argument is only -L2 but should be --L2 (two minus signs) like in the second call - where -L1 misses its second "-".

Thank you for a very mighty set of tool
Sincerely
	Mattias
-- 
Mattias Ulbrich
Forschungsgruppe Prof. Dr. P.H. Schmitt
Institut für Theoretische Informatik
Universität Karlsruhe
Next: Junio C Hamano
Message 1 of 2 in “git-mergetool”
  1. Mattias UlbrichSep 28, 2007
  2. Junio C HamanoSep 29, 2007

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.