Skip to content
GitLab
Explore
Sign in
Commit
38933324
authored
Apr 20, 2017
by
Michael Raskin
Committed by
GitHub
Apr 20, 2017
Browse files
Merge pull request #25059 from vcunat/p/kdiff3-git-mergetool
kdiff3: fix with git mergetool
parents
d15f26ec
be7ce1b0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment