From: Alan Knowles Date: Fri, 15 Mar 2019 03:27:28 +0000 (+0800) Subject: Git.vala X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=271892157e8720db02767c7fa70a3e8d452d6433 Git.vala --- diff --git a/Git.vala b/Git.vala index 5d4d6acf..6e00fc49 100644 --- a/Git.vala +++ b/Git.vala @@ -194,7 +194,10 @@ namespace GitLive { var master_commit = this.repo.lookup_commit(master_oid);; var head_commit = this.repo.lookup_commit(head_oid); + + var anc_oid = this.repo.merge_base(master_commit.get_oid(), head_commit.get_oid()); + }