Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

GitWrapper
- Activity
- Members
- Labels
- Terraform modules
- Model experiments

Snippets Groups Projects

7afdc3c0

Commit 7afdc3c0 authored 8 years ago by Florian Heck

Downloads
- Patches
- Plain Diff

refactored generic pair to specific merge conflict bean

parent 9e736619

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/de/uni_passau/fim/seibt/gitwrapper/repo/MergeConflict.java 21 additions, 0 deletions

...e/uni_passau/fim/seibt/gitwrapper/repo/MergeConflict.java
src/de/uni_passau/fim/seibt/gitwrapper/repo/Repository.java 6 additions, 7 deletions

src/de/uni_passau/fim/seibt/gitwrapper/repo/Repository.java
src/de/uni_passau/fim/seibt/gitwrapper/util/Pair.java 0 additions, 19 deletions

src/de/uni_passau/fim/seibt/gitwrapper/util/Pair.java

with 27 additions and 26 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment