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
ec647aa
..
02c0669
100644
(file)
--- a/
Git.vala
+++ b/
Git.vala
@@
-20,7
+20,7
@@
void main()
Ggit.init();
var a = new GitLive.Repo("/home/alan/gitlive/gitlive");
- a.mergeMasterIntoHead();
+
//
a.mergeMasterIntoHead();
//a.walkDiff();
return;
a.is_managed();