From 23061d67a3ef0e3b857800357b593f1042eb71f0 Mon Sep 17 00:00:00 2001
From: Georg Seibt <seibt@fim.uni-passau.de>
Date: Thu, 14 Apr 2016 13:10:16 +0200
Subject: [PATCH] renaming
---
src/de/uni_passau/fim/seibt/gitwrapper/repo/Repository.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/de/uni_passau/fim/seibt/gitwrapper/repo/Repository.java b/src/de/uni_passau/fim/seibt/gitwrapper/repo/Repository.java
index f90179c..102a7fb 100644
--- a/src/de/uni_passau/fim/seibt/gitwrapper/repo/Repository.java
+++ b/src/de/uni_passau/fim/seibt/gitwrapper/repo/Repository.java
@@ -86,7 +86,7 @@ public class Repository {
* the second {@link Commit}
* @return the merge base or
*/
- public Optional<Commit> mergeBase(Commit a, Commit b) {
+ public Optional<Commit> getMergeBase(Commit a, Commit b) {
if (!(commits.values().contains(a) && commits.values().contains(b))) {
LOG.warning(() -> "Both commits must be part of the repository to get a merge base for them.");
--
GitLab