Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-nested-repo.out
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 11 Dec 2006 18:09:52 +0100
changeset 3869 ad6f34c83c3d
parent 2139 74f70f2e08aa
child 5141 d316124ebbea
permissions -rw-r--r--
Add instructions how to redo/finish failed merge with local working directory. b2ae81a7df29 already implemented this for branch merges.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2061
5987c1eac2ce support nested repositories.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     1
 
# should print nothing
5987c1eac2ce support nested repositories.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     2
 
# should print ? b/x
5987c1eac2ce support nested repositories.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     3
 
? b/x
5987c1eac2ce support nested repositories.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     4
 
# should print A b/x
5987c1eac2ce support nested repositories.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     5
 
A b/x
5987c1eac2ce support nested repositories.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     6
 
# should forget b/x
5987c1eac2ce support nested repositories.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     7
 
forgetting b/x
5987c1eac2ce support nested repositories.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     8
 
# should print nothing
mercurial-crew-with-dirclash