Summary: | Unable to save files when -o parameter is used. Message says: klauncher said: Unknown protocol ''. | ||
---|---|---|---|
Product: | [Applications] kdiff3 | Reporter: | Greg Martyn <greg.martyn> |
Component: | application | Assignee: | michael <reeves.87> |
Status: | RESOLVED UNMAINTAINED | ||
Severity: | critical | CC: | dkowis, kfunk, maednoldor, someuniquename |
Priority: | NOR | ||
Version: | 0.9.97 | ||
Target Milestone: | --- | ||
Platform: | Fedora RPMs | ||
OS: | Linux | ||
Latest Commit: | Version Fixed In: |
Description
Greg Martyn
2012-09-17 04:04:34 UTC
Thanks for reporting. Fixed in the git repo on sourceforge. Joachim GIt's mergetool kdiff3 still uses "-o" parameter. The file https://github.com/git/git/blob/master/mergetools/kdiff3 is identical to the one on my local machine, but I still has the problem. A error occurs only if a file with the name, specified by "-o" parameter exists. As for me, the following diff works fine: --- kdiff3_orig 2013-02-05 12:02:40.795566548 +0400 +++ kdiff3 2013-02-05 12:00:29.279060587 +0400 @@ -11,7 +11,7 @@ --L1 "$MERGED (Base)" \ --L2 "$MERGED (Local)" \ --L3 "$MERGED (Remote)" \ - -o "$MERGED" "$BASE" "$LOCAL" "$REMOTE" \ + -o `pwd`/"$MERGED" "$BASE" "$LOCAL" "$REMOTE" \ >/dev/null 2>&1 else "$merge_tool_path" --auto \ Reopening based on comment #2 Please verify with lastest kdiff3 I am unable to repo. |