##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

keyword: remove "identify" and "remove" from nokwcommands...
keyword: remove "identify" and "remove" from nokwcommands These two commands care about the list of modified files returned by repo.status and we may need to do a full content comparison to populate that list.
Matt Mackall - - Load All Authors

File last commit:

r5863:3d1f9dce default
r6157:09b00faa default
Show More
test-merge10.out
19 lines | 616 B | text/plain | TextLexer
/ tests / test-merge10.out
History | Source | Raw |Copy content |Copy permalink
Giorgos Keramidas
tests: add merge test for changeset 9fe267f77f56...
 r4696 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging testdir/subdir/a and testdir/a
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M testdir/subdir/a
diff -r d02b3fc32762 testdir/subdir/a
--- a/testdir/subdir/a
+++ b/testdir/subdir/a
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: add merge test for changeset 9fe267f77f56...
 r4696 -a
+alpha