SUMMARY
***
I have try to merge main into another branch. After calling `git mergetool` to resolve conflicts.
Kdiff3 does not open any gui and git mark the files as resolve, but the files dose still include the unresolved conflicts.
No error message is show.
Git mergetool does work  fine with meld (`git config --global merge.tool meld`), so I think this is a kdiff3 issue.
```rust
fn main() -> tetra::Result {
<<<<<<< HEAD
	let players = usb::Players::init();
	ContextBuilder::new(format!("{CARGO_PKG_NAME} v{CARGO_PKG_VERSION}"), 640, 480)
||||||| 20867de
	println!("{:?}", LEVELS[0]);
	ContextBuilder::new(format!("{CARGO_PKG_NAME} v{CARGO_PKG_VERSION}"), 640, 480)
=======
	my_env_logger_style::just_log();
	info!("{:?}", LEVELS[0]);
	ContextBuilder::new(format!("{CARGO_PKG_NAME} v{CARGO_PKG_VERSION}"), 1280, 720)
>>>>>>> main
		.quit_on_escape(true)
```
***


STEPS TO REPRODUCE
merge https://github.com/LuckyTurtleDev/m3/tree/main (d3ef2cd) into https://github.com/LuckyTurtleDev/m3/tree/bincode (0cefeb1)
```bash
❯ git merge main
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Auto-merging pc/Cargo.toml
CONFLICT (content): Merge conflict in pc/Cargo.toml
Auto-merging pc/src/main.rs
CONFLICT (content): Merge conflict in pc/src/main.rs
Automatic merge failed; fix conflicts and then commit the result. 
```
```bash
❯ git mergetool
Merging:
Cargo.lock
pc/Cargo.toml
pc/src/main.rs

Normal merge conflict for 'Cargo.lock':
  {local}: modified file
  {remote}: modified file

Normal merge conflict for 'pc/Cargo.toml':
  {local}: modified file
  {remote}: modified file

Normal merge conflict for 'pc/src/main.rs':
  {local}: modified file
  {remote}: modified file
```

OBSERVED RESULT
dont resolve conflicts

EXPECTED RESULT
resolve conflicts ?

SOFTWARE/OS VERSIONS
Windows: 
macOS: 
Linux/KDE Plasma: 
(available in About System)
KDE Plasma Version: 
KDE Frameworks Version: 
Qt Version: 

ADDITIONAL INFORMATION