Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-convert-git @ 5372:6f6aa7f3bc1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew
author Matt Mackall <mpm@selenic.com>
date Thu, 04 Oct 2007 19:47:22 -0500
parents 8ab7de07f40e
children a5a7f7fd5554
comparison
equal deleted inserted replaced
5371:17ed9b9a0d03 5372:6f6aa7f3bc1c
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