Compare View
Commits (35)
-
Adding main()
-
Conflicts: sanlien_hihi.txt
-
# Conflicts: # changeLog.txt # newFile.txt
-
# Conflicts: # changeLog.txt
Showing
9 changed files
Show diff stats
README
| File was created | 1 | //123456789 | |
| 2 | void main(void) | ||
| 3 | { | ||
| 4 | define Tom PHD | ||
| 5 | } |
changeLog.txt
| 1 | <<<<<<< HEAD | ||
| 2 | fdfshsj | 1 | <<<<<<< .mine |
| 2 | <<<<<<< HEAD | ||
| 3 | ?fdfshsj | ||
| 4 | htehtrjj | ||
| 5 | ======= | ||
| 6 | dfshsj | ||
| 7 | |||
| 8 | |||
| 9 | >>>>>>> .theirs | ||
| 10 | getjryrl | ||
| 11 | ======= | ||
| 12 | ?fdfshsj | ||
| 13 | htehtrjj | ||
| 14 | getjryrl | ||
| 15 | >>>>>>> 170b5319e9961afd5839d2ad8b2d880fad3f7e3f |
jeff_code/V001.txt
| File was created | 1 | ddasddqwdwdd |
jeff_code/V002.txt
| File was created | 1 | vvvvv |
jeff_code/V003.txt
| File was created | 1 | vvvv |
jeff_code/V004.txt
newFile.txt
| File was created | 1 | <<<<<<< HEAD | |
| 2 | fyhdrfjhl | ||
| 3 | ======= | ||
| 4 | fyhdrfjhl | ||
| 5 | >>>>>>> 170b5319e9961afd5839d2ad8b2d880fad3f7e3f | ||
| 6 | mohiup9g] |
sanlien_hihi.txt
| File was created | 1 | bbbbb | |
| 2 | frank |