Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add 3-way merge implementation #8

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Conversation

satabin
Copy link
Member

@satabin satabin commented May 16, 2017

No description provided.

@satabin satabin added this to the 0.2.0 milestone May 16, 2017
@satabin satabin self-assigned this May 16, 2017
@codecov-io
Copy link

Codecov Report

Merging #8 into master will decrease coverage by 1.65%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master       #8      +/-   ##
==========================================
- Coverage   39.43%   37.77%   -1.66%     
==========================================
  Files          43       44       +1     
  Lines        1481     1546      +65     
  Branches      156      158       +2     
==========================================
  Hits          584      584              
- Misses        897      962      +65
Impacted Files Coverage Δ
src/main/scala/gnieh/diff/Diff3.scala 0% <0%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 250f3c2...978ea54. Read the comment docs.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants