projects
/
gitlive
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Git.vala
[gitlive]
/
Git.vala
diff --git
a/Git.vala
b/Git.vala
index
63c03c7
..
d7a9aff
100644
(file)
--- a/
Git.vala
+++ b/
Git.vala
@@
-220,6
+220,13
@@
namespace GitLive {
}
+
+ public void diffhead()
+ {
+
+ }
+
+
public void mergeMasterIntoHead()
{
// assumes head is not master...
@@
-272,6
+279,9
@@
namespace GitLive {
}
+
+
+
/*
public bool doMergeClose(string commit_message)
{