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

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

merge with stable
merge with stable
Martin Geisler - - Load All Authors

File last commit:

r12156:4c94b6d0 default
r12278:c4c2ba55 merge default
Show More
test-merge-revert2.out
38 lines | 909 B | text/plain | TextLexer
/ tests / test-merge-revert2.out
History | Source | Raw |Copy content |Copy permalink
Martin Geisler
tests: remove unneeded -d flags...
 r12156 1:dfab7f3c2efb
0:c3fa057dd86f
dfab7f3c2efb tip
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Martin Geisler
tests: remove unneeded -d flags...
 r12156 c3fa057dd86f
c3fa057dd86f+
Vadim Gelfer
rewrite revert command. fix issues 93, 123, 147....
 r2029 reverting file1
Martin Geisler
tests: remove unneeded -d flags...
 r12156 c3fa057dd86f
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Martin Geisler
tests: remove unneeded -d flags...
 r12156 dfab7f3c2efb tip
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall
merge: allow smarter tool configuration...
 r6004 merging file1
Alexis S. L. Carvalho
change tests to use simplemerge by default
 r4365 warning: conflicts during merge.
Thomas Arendsen Hein
Added tests for bug with three-way-merging of old tip, tip and cwd.
 r792 merging file1 failed!
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
Matt Mackall
resolve: new command...
 r6518 use 'hg resolve' to retry unresolved file merges
Martin Geisler
tests: remove unneeded -d flags...
 r12156 diff -r dfab7f3c2efb file1
Thomas Arendsen Hein
Added tests for bug with three-way-merging of old tip, tip and cwd.
 r792 --- a/file1
+++ b/file1
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,3 +1,7 @@
Thomas Arendsen Hein
Added tests for bug with three-way-merging of old tip, tip and cwd.
 r792 added file1
Thomas Arendsen Hein
Extended test case to test dirstate length bug fixed in a7e95e3606c7.
 r864 another line of text
Matt Mackall
merge: allow smarter tool configuration...
 r6004 +<<<<<<< local
Thomas Arendsen Hein
Added tests for bug with three-way-merging of old tip, tip and cwd.
 r792 +changed file1 different
+=======
changed file1
Alexis S. L. Carvalho
run-tests.py: pass -L/--label to simplemerge...
 r4387 +>>>>>>> other
Thomas Arendsen Hein
Added tests for bug with three-way-merging of old tip, tip and cwd.
 r792 M file1
Matt Mackall
merge: allow smarter tool configuration...
 r6004 ? file1.orig
Martin Geisler
tests: remove unneeded -d flags...
 r12156 dfab7f3c2efb+ tip
Vadim Gelfer
rewrite revert command. fix issues 93, 123, 147....
 r2029 reverting file1
Matt Mackall
merge: allow smarter tool configuration...
 r6004 ? file1.orig
Martin Geisler
tests: remove unneeded -d flags...
 r12156 dfab7f3c2efb tip
Matt Mackall
merge: allow smarter tool configuration...
 r6004 ? file1.orig
Martin Geisler
tests: remove unneeded -d flags...
 r12156 dfab7f3c2efb tip
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall
merge: allow smarter tool configuration...
 r6004 ? file1.orig
Martin Geisler
tests: remove unneeded -d flags...
 r12156 dfab7f3c2efb tip