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

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

Merge with stable
Steve Borho -
r12318:d643ae55 merge default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -25,8 +25,8 b' diff --git a/a.txt b/a.txt'
25 25 merging a.txt
26 26 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
27 27 % printrepr.py a.txt
28 first\r
29 third\r
28 first
29 third
30 30 % hg diff
31 31 diff --git a/a.txt b/a.txt
32 32 --- a/a.txt
@@ -57,8 +57,8 b' diff --git a/a.txt b/a.txt'
57 57 merging a.txt
58 58 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
59 59 % printrepr.py a.txt
60 first\r
61 third\r
60 first
61 third
62 62 % hg diff
63 63 diff --git a/a.txt b/a.txt
64 64 --- a/a.txt
General Comments 0
You need to be logged in to leave comments. Login now