Skip to content

Commit

Permalink
Merge branch 'main' of github.com:jpedroh/generic-merge into refactor…
Browse files Browse the repository at this point in the history
…-adjust-exit-codes
  • Loading branch information
jpedroh committed Dec 5, 2023
2 parents 63a8051 + d7225e8 commit 292a4de
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 0 deletions.
5 changes: 5 additions & 0 deletions bin/tests/scenarios/arithmetic_expression/base.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
public class Test {
private int method() {
return 2 * (3 + 4);
}
}
5 changes: 5 additions & 0 deletions bin/tests/scenarios/arithmetic_expression/left.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
public class Test {
private int method() {
return 3 * (3 + 4);
}
}
1 change: 1 addition & 0 deletions bin/tests/scenarios/arithmetic_expression/merge.java
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
public class Test { private int method ( ) { return 3 * ( 4 + 4 ) ; } }
5 changes: 5 additions & 0 deletions bin/tests/scenarios/arithmetic_expression/right.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
public class Test {
private int method() {
return 2 * (4 + 4);
}
}
6 changes: 6 additions & 0 deletions bin/tests/scenarios/consecutive_lines/base.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
public class Test {
private void method() {
int a = 0;
int b = 0;
}
}
6 changes: 6 additions & 0 deletions bin/tests/scenarios/consecutive_lines/left.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
public class Test {
private void method() {
int a = 1;
int b = 0;
}
}
1 change: 1 addition & 0 deletions bin/tests/scenarios/consecutive_lines/merge.java
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
public class Test { private void method ( ) { int a = 1 ; int b = 1 ; } }
6 changes: 6 additions & 0 deletions bin/tests/scenarios/consecutive_lines/right.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
public class Test {
private void method() {
int a = 0;
int b = 1;
}
}

0 comments on commit 292a4de

Please sign in to comment.