projects
/
IRC.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
586ae74
)
add a second task to generate conflicts
author
jjenista
<jjenista>
Fri, 4 Mar 2011 23:08:40 +0000
(23:08 +0000)
committer
jjenista
<jjenista>
Fri, 4 Mar 2011 23:08:40 +0000
(23:08 +0000)
Robust/src/Tests/dfj/case2/test.java
patch
|
blob
|
history
diff --git
a/Robust/src/Tests/dfj/case2/test.java
b/Robust/src/Tests/dfj/case2/test.java
index 4904cfb7469b88f80fdfb3050ea45a7fd90ef3d1..8295d3967223191437e3288f7314704cd586e06d 100644
(file)
--- a/
Robust/src/Tests/dfj/case2/test.java
+++ b/
Robust/src/Tests/dfj/case2/test.java
@@
-58,6
+58,10
@@
public class Test {
}
}
+ rblock S {
+ a.g.g.g = getFoo4();
+ }
+
System.out.println( total );
}