Merge branch 'jk/format-patch-am'
[git] / t / t4034 / java / expect
1 <BOLD>diff --git a/pre b/post<RESET>
2 <BOLD>index 23d5c8a..7e8c026 100644<RESET>
3 <BOLD>--- a/pre<RESET>
4 <BOLD>+++ b/post<RESET>
5 <CYAN>@@ -1,19 +1,19 @@<RESET>
6 Foo() : x(0<RED>&&1<RESET><GREEN>&42<RESET>) { <GREEN>bar(x);<RESET> }
7 cout<<"Hello World<RED>!<RESET><GREEN>?<RESET>\n"<<endl;
8 <GREEN>(<RESET>1<GREEN>) (<RESET>-1e10<GREEN>) (<RESET>0xabcdef<GREEN>)<RESET> '<RED>x<RESET><GREEN>y<RESET>'
9 [<RED>a<RESET><GREEN>x<RESET>] <RED>a<RESET><GREEN>x<RESET>-><RED>b a<RESET><GREEN>y x<RESET>.<RED>b<RESET><GREEN>y<RESET>
10 !<RED>a<RESET><GREEN>x<RESET> ~<RED>a a<RESET><GREEN>x x<RESET>++ <RED>a<RESET><GREEN>x<RESET>-- <RED>a<RESET><GREEN>x<RESET>*<RED>b a<RESET><GREEN>y x<RESET>&<RED>b<RESET>
11 <RED>a<RESET><GREEN>y<RESET>
12 <GREEN>x<RESET>*<RED>b a<RESET><GREEN>y x<RESET>/<RED>b a<RESET><GREEN>y x<RESET>%<RED>b<RESET>
13 <RED>a<RESET><GREEN>y<RESET>
14 <GREEN>x<RESET>+<RED>b a<RESET><GREEN>y x<RESET>-<RED>b<RESET>
15 <RED>a<RESET><GREEN>y<RESET>
16 <GREEN>x<RESET><<<RED>b a<RESET><GREEN>y x<RESET>>><RED>b<RESET>
17 <RED>a<RESET><GREEN>y<RESET>
18 <GREEN>x<RESET><<RED>b a<RESET><GREEN>y x<RESET><=<RED>b a<RESET><GREEN>y x<RESET>><RED>b a<RESET><GREEN>y x<RESET>>=<RED>b<RESET>
19 <RED>a<RESET><GREEN>y<RESET>
20 <GREEN>x<RESET>==<RED>b a<RESET><GREEN>y x<RESET>!=<RED>b<RESET>
21 <RED>a<RESET><GREEN>y<RESET>
22 <GREEN>x<RESET>&<RED>b<RESET>
23 <RED>a<RESET><GREEN>y<RESET>
24 <GREEN>x<RESET>^<RED>b<RESET>
25 <RED>a<RESET><GREEN>y<RESET>
26 <GREEN>x<RESET>|<RED>b<RESET>
27 <RED>a<RESET><GREEN>y<RESET>
28 <GREEN>x<RESET>&&<RED>b<RESET>
29 <RED>a<RESET><GREEN>y<RESET>
30 <GREEN>x<RESET>||<RED>b<RESET>
31 <RED>a<RESET><GREEN>y<RESET>
32 <GREEN>x<RESET>?<RED>b<RESET><GREEN>y<RESET>:z
33 <RED>a<RESET><GREEN>x<RESET>=<RED>b a<RESET><GREEN>y x<RESET>+=<RED>b a<RESET><GREEN>y x<RESET>-=<RED>b a<RESET><GREEN>y x<RESET>*=<RED>b a<RESET><GREEN>y x<RESET>/=<RED>b a<RESET><GREEN>y x<RESET>%=<RED>b a<RESET><GREEN>y x<RESET><<=<RED>b a<RESET><GREEN>y x<RESET>>>=<RED>b a<RESET><GREEN>y x<RESET>&=<RED>b a<RESET><GREEN>y x<RESET>^=<RED>b a<RESET><GREEN>y x<RESET>|=<RED>b<RESET>
34 <RED>a<RESET><GREEN>y<RESET>
35 <GREEN>x<RESET>,y
36 <RED>a<RESET><GREEN>x<RESET>::<RED>b<RESET><GREEN>y<RESET>