HomeSolus

Initial commit of kdiff3

Authored by livingsilver94 on Jul 16 2020, 10:07 AM.

Description

Initial commit of kdiff3

Summary: Inclusion of kdiff3 into Solus repository. Fixes T5897.

Test Plan: Created a simple git repository with two conflicting branches. Merged branch2 into master by solving the conflict with kdiff3.

Reviewers: Triage Team, JoshStrobl

Reviewed By: Triage Team, JoshStrobl

Subscribers: JoshStrobl, Girtablulu

Maniphest Tasks: T5897

Differential Revision: https://dev.getsol.us/D9222

Details

Committed
JoshStroblJul 16 2020, 10:08 AM
Pushed
JoshStroblJul 16 2020, 10:08 AM
Reviewer
Triage Team
Differential Revision
D9222: Initial commit of kdiff3
Parents
R5041:9ef4b561f6d5: Initial repository construction
Branches
Unknown
Tags
Unknown
References
tag: kdiff3-1.8.3-1
Tasks
T5897: Kdiff3 diff tool