Running Kdiff3 command in silent mode
Asked Answered
L

1

5

Does anyone know how to perform 3-way auto-merge of local files with "kdiff3" command in silent mode, without showing kdiff3 GUI regardless of the outcome of the merge?

What I'd like to see as behaviour of kdiff3 is as following:
- Kdiff3 returns a "0" code if the auto-merge is successful
- Kdiff3 returns <> "0" code if it requires a manual resolution of conflict

The command of kdiff3 that I will run:

kdiff3 -m file1 file2 file3 -o Outputfile --auto
Lynda answered 29/3, 2016 at 15:8 Comment(0)
T
6

I had the same issue as well.

Just open the kdiff3 gui, go to Settings > Configure KDiff3...

Then open the Merge tab, and make sure 'Show info dialogs' is unchecked.

Merge Dialog

When you run it next, it shouldn't come up with any info dialogs if you get successful merges.

Terrill answered 23/8, 2017 at 0:58 Comment(1)
This eliminates dialogs for successful merges, but it does not answer the question, which specified "without showing kdiff3 GUI regardless of the outcome of the merge".Sluggard

© 2022 - 2024 — McMap. All rights reserved.