rad11
rad11

Reputation: 1561

Kdiff do not load files after merge conflicts

After doing the git extension update, stopped loading files while resolving conflicts I get an empty window where there are no files in the base, local and remote version(but files are created in folder with *.base, *.local, *.remote extensions).

After click Open in KDiff I see:

enter image description here

I`m using versions:

Git extension - 3.3 Kdiff - 0.9.98

Upvotes: 0

Views: 684

Answers (1)

RussKie
RussKie

Reputation: 1850

Software bugs should be reported to app developers, no point raising bugs or asking about them here. There is a "Report an issue" menu under "Help":

enter image description here

As far as your issue is concerned, please see https://github.com/gitextensions/gitextensions/issues/7544 and https://github.com/gitextensions/gitextensions/pull/7549

Upvotes: 1

Related Questions