python_learning/Eclipse_test_item.c at master · vstokic/python_learning · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
#include <stdio.h>
#include "somefunctions.c"


int main ()
{
	printf("launch application -- ");
	//do something
	//make clean up
	//Modification for demo and commit
	//Local work comment
	return 0;
}

//Change No1

IP changes

//Change No2


//Change No3


//Change No4

//Change No5 branch


//Branch test


<<<<<<< Upstream, based on master
<<<<<<< Upstream, based on master
Master1


Master2
=======
Vaso1
>>>>>>> da867cf Vaso1
=======
Vaso1

Vaso2
>>>>>>> f6eca57 Vaso2


//Source tree testing