changeset 5361 | 8ab7de07f40e |
parent 5346 | 9f35d0bcf00e |
child 5380 | a5a7f7fd5554 |
5359:645a40777fd4 | 5361:8ab7de07f40e |
---|---|
30 git add a d |
30 git add a d |
31 commit -a -m t1 |
31 commit -a -m t1 |
32 |
32 |
33 # Remove the directory, then try to replace it with a file |
33 # Remove the directory, then try to replace it with a file |
34 # (issue 754) |
34 # (issue 754) |
35 git rm -r d |
35 git rm -f d/b |
36 commit -m t2 |
36 commit -m t2 |
37 echo d > d |
37 echo d > d |
38 git add d |
38 git add d |
39 commit -m t3 |
39 commit -m t3 |
40 |
40 |