{"thread":{"id":"10058","subject":"git-mergetool","startedAt":"2007-09-28T08:56:15Z","lastAt":"2007-09-29T09:27:02Z","messageCount":2,"participants":["Mattias Ulbrich","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"54250","messageId":"200709281056.15844.mulbrich@ira.uka.de","threadId":"10058","inReplyTo":null,"subject":"git-mergetool","fromName":"Mattias Ulbrich","fromEmail":"mulbrich@ira.uka.de","sentAt":"2007-09-28T08:56:15Z","receivedAt":"2007-09-28T08:56:15Z","isPatch":false,"sender":{"key":"mulbrich@ira.uka.de","avatar":null},"body":"\nHello everybody,\n\nThere might by a tiny typo-bug in the git-mergetool:\n\n-----------\n case \"$merge_tool\" in\n\tkdiff3)\n\t    if base_present ; then\n\t\t(kdiff3 --auto --L1 \"$path (Base)\" -L2 \"$path (Local)\" --L3 \"$path (Remote)\" \n\\\n\t\t    -o \"$path\" -- \"$BASE\" \"$LOCAL\" \"$REMOTE\" > /dev/null 2>&1)\n\t    else\n\t\t(kdiff3 --auto -L1 \"$path (Local)\" --L2 \"$path (Remote)\" \\\n\t\t    -o \"$path\" -- \"$LOCAL\" \"$REMOTE\" > /dev/null 2>&1)\n\t    fi\n-----------\n\nIn the first call to kdiff3 the argument is only -L2 but should be --L2 (two \nminus signs) like in the second call - where -L1 misses its second \"-\".\n\nThank you for a very mighty set of tool\n\nSincerely\n\n\tMattias\n\n-- \nMattias Ulbrich\nForschungsgruppe Prof. Dr. P.H. Schmitt\nInstitut für Theoretische Informatik\nUniversität Karlsruhe\n"},{"id":"54320","messageId":"7vps01lt3t.fsf@gitster.siamese.dyndns.org","threadId":"10058","inReplyTo":"200709281056.15844.mulbrich@ira.uka.de","subject":"Re: git-mergetool","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-09-29T09:27:02Z","receivedAt":"2007-09-29T09:27:02Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks.\n"}]}