projects
/
gitlive
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f15ee0f
0a9d49d
)
Monitor.js
author
Alan Knowles
<alan@akbkhome.com>
Fri, 16 Jul 2010 02:16:54 +0000
(10:16 +0800)
committer
Alan Knowles
<alan@akbkhome.com>
Fri, 16 Jul 2010 02:16:54 +0000
(10:16 +0800)
1
2
gitlive.js
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
gitlive.js
index
55dec35
,
549bcb6
..
bf296b3
---
1
/
gitlive.js
---
2
/
gitlive.js
+++ b/
gitlive.js
@@@
-91,7
-91,7
+91,11
@@@
var monitor = new Monitor(
cmds.forEach(function(cmd) {
// prevent duplicate calls..
if (done.indexOf(cmd.join(',')) > -1) {
++<<<<<<< HEAD
+ return;
++=======
+ return;
++>>>>>>> 0a9d49d2bf517d459e7f027fe21d49bc7f3fbcd0
}
done.push(cmd.join(','));