Mercurial Mercurial > hg / 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-mq-qgoto.out
author Bryan O'Sullivan <bos@serpentine.com>
Fri, 02 Nov 2007 14:02:28 -0700
changeset 5503 6f26c7677463
parent 4432 905397be7688
child 7568 12df451ce205
permissions -rw-r--r--
Test a merge of a symlink against an executable file. This should result in a conflict, but the symlink always wins.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4432
905397be7688 mq: add qgoto command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     1
 
adding a
905397be7688 mq: add qgoto command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     2
 
Now at: a.patch
905397be7688 mq: add qgoto command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     3
 
applying b.patch
905397be7688 mq: add qgoto command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     4
 
applying c.patch
905397be7688 mq: add qgoto command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     5
 
Now at: c.patch
905397be7688 mq: add qgoto command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     6
 
Now at: b.patch
Mercurial