help
test rm file
test 3 undo
commit dau tien
test merge
test merge 2