Merger.js
authorAlan Knowles <alan@akbkhome.com>
Sun, 11 Sep 2011 15:00:39 +0000 (23:00 +0800)
committerAlan Knowles <alan@akbkhome.com>
Sun, 11 Sep 2011 15:00:39 +0000 (23:00 +0800)
Merger.js

index 6533865..118d2eb 100644 (file)
--- a/Merger.js
+++ b/Merger.js
@@ -405,7 +405,7 @@ Merger=new XObject({
                                         var repo = new Repo({ repopath : '/home/alan/gitlive/roojs1' });
                                      
                                      
-                                        var diff = repo.diff('/',  'rev', 'github..master', files);
+                                        var diff = repo.diff('github', 'master',  files);