https://bugs.kde.org/show_bug.cgi?id=403996
Bug ID: 403996
Summary: deleted files crash app when using with git
Product: kdiff3
Version: 1.7.90
Platform: Archlinux Packages
OS: Linux
Status: REPORTED
Severity: normal
Priority: NOR
Component: application
Assignee: [email protected]
Reporter: [email protected]
Target Milestone: ---
$ git commit -m "remove duplicate gradle wrapper in app"
[st-androidx 559517df] remove duplicate gradle wrapper in app
4 files changed, 256 deletions(-)
delete mode 100644 app/gradle/wrapper/gradle-wrapper.jar
delete mode 100644 app/gradle/wrapper/gradle-wrapper.properties
delete mode 100644 app/gradlew
delete mode 100644 app/gradlew.bat
$ git difftool 559517dfc35a6b0aa9cd489390b58a8661dc2eae^!
This message is displayed because 'diff.tool' is not configured.
See 'git difftool --tool-help' or 'git help config' for more details.
'git difftool' will now attempt to use one of the following tools:
opendiff kdiff3 tkdiff xxdiff meld kompare gvimdiff diffuse diffmerge ecmerge
p4merge araxis bc codecompare vimdiff emerge
Viewing (1/4): 'app/gradle/wrapper/gradle-wrapper.jar'
Launch 'kdiff3' [Y/n]?
/usr/lib/git-core/mergetools/kdiff3: line 1: 5719 Killed
"$merge_tool_path" --L1 "$MERGED (A)" --L2 "$MERGED (B)" "$LOCAL" "$REMOTE" >
/dev/null 2>&1
fatal: external diff died, stopping at app/gradle/wrapper/gradle-wrapper.jar
$ kdiff3 --version
org.kde.knotifications: Audio notification requested, but sound file from
notifyrc file was not found, aborting audio notification
kdiff3 1.7.90 (64 bit)
--
You are receiving this mail because:
You are watching all bug changes.
