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

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

fetch: do not count inactive branches when inferring a merge...
fetch: do not count inactive branches when inferring a merge The fetch extension would erroneously consider inactive branches when inferring which branches to merge. It now considers only active branches.
Stepan Koltsov - - Load All Authors

File last commit:

r7628:9c6ae2e0 default
r7854:423b4482 default
Show More
test-diff-change.out
30 lines | 463 B | text/plain | TextLexer
/ tests / test-diff-change.out
History | Annotation | Raw |Copy content |Copy permalink
invoking hg diff --nodates --change 1:
diff -r 4bb65dda5db4 -r e9b286083166 file.txt
--- a/file.txt
+++ b/file.txt
@@ -1,1 +1,1 @@
-first
+second
invoking hg diff --nodates --change e9b286083166:
diff -r 4bb65dda5db4 -r e9b286083166 file.txt
--- a/file.txt
+++ b/file.txt
@@ -1,1 +1,1 @@
-first
+second
invoking hg diff --nodates --change 6:
diff -r e8a0797e73a6 -r aa9873050139 file.txt
--- a/file.txt
+++ b/file.txt
@@ -6,6 +6,6 @@
5
6
7
-8
+y
9
10
EOF