forked from ds1004-sp17/ds1004
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathdsp372.log
64 lines (62 loc) · 1.25 KB
/
dsp372.log
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
51
52
53
54
55
56
57
58
59
60
61
62
63
64
dsp372
* c86db5b Final merge
|\
| * a5a1ada Merging testingnode1 & testingnode3
| |\
| | * db7cd4e text added to testingfile2 on testingnode3
| * | c27a067 testingfile1 changed on testingnode1
* | | b5c03ad Merging M & testingnode2
|\ \ \
| |_|/
|/| |
| * | 46b5df2 testingfile3 added on testingnode2
* | | be06788 Merging M & testingnode1
|\ \ \
| |/ /
|/| /
| |/
| * f456d9b 2nd(1st on testingnode1)
* | 741c603 added testingfile2
|/
* f6d93e6 testingfile1 added to M
pa1230
* cc9bdff Final merge
|\
| * b81678a Merging t1 & t3
| |\
| | * abc9b1e text added to f2 on t3
| * | 85ff88d f1 changed on t1
* | | 2e0b4c5 Merging M & t2
|\ \ \
| |_|/
|/| |
| * | 4f1e2c1 f3 added on t2
* | | cd12907 Merging M & t1
|\ \ \
| |/ /
|/| /
| |/
| * ea7a0a9 Text 2 added to f1 on t1
* | 8551071 added f2 on M
|/
* b050095 f1 added to M
sa4413
* 5e58809 last merge
|\
| * edbc12c Merging branch1 and branch3
| |\
| | * 2dc0edf branch3.txt added
| * | f0fec7a Making changes to branch1.txt
| |/
* | 9442b0f Merging branch2
|\ \
| * | c7140a7 Adding branch2.txt
* | | 609eaf0 Mergring br1
|\ \ \
| |/ /
|/| /
| |/
| * 134f3f2 branch1.txt added
* | c7d50ef Some changes
|/
* 49e5bc7 main.txt added