equal
deleted
inserted
replaced
4 $ cat >> $HGRCPATH <<EOF |
4 $ cat >> $HGRCPATH <<EOF |
5 > [ui] |
5 > [ui] |
6 > merge = internal:fail |
6 > merge = internal:fail |
7 > [extensions] |
7 > [extensions] |
8 > largefiles = |
8 > largefiles = |
|
9 > [defaults] |
|
10 > # for portability |
|
11 > extdiff = --option -Nru |
9 > EOF |
12 > EOF |
10 |
13 |
11 $ hg init repo |
14 $ hg init repo |
12 $ cd repo |
15 $ cd repo |
13 |
16 |
19 $ hg commit -m '#0' |
22 $ hg commit -m '#0' |
20 $ echo 'large1 in #1' > large1 |
23 $ echo 'large1 in #1' > large1 |
21 $ echo 'normal1 in #1' > normal1 |
24 $ echo 'normal1 in #1' > normal1 |
22 $ hg commit -m '#1' |
25 $ hg commit -m '#1' |
23 $ hg extdiff -r '.^' --config extensions.extdiff= |
26 $ hg extdiff -r '.^' --config extensions.extdiff= |
24 diff -Npru repo.0d9d9b8dc9a3/.hglf/large1 repo/.hglf/large1 |
27 diff -Nru repo.0d9d9b8dc9a3/.hglf/large1 repo/.hglf/large1 |
25 --- repo.0d9d9b8dc9a3/.hglf/large1 * (glob) |
28 --- repo.0d9d9b8dc9a3/.hglf/large1 * (glob) |
26 +++ repo/.hglf/large1 * (glob) |
29 +++ repo/.hglf/large1 * (glob) |
27 @@ -1 +1 @@ |
30 @@ -1 +1 @@ |
28 -4669e532d5b2c093a78eca010077e708a071bb64 |
31 -4669e532d5b2c093a78eca010077e708a071bb64 |
29 +58e24f733a964da346e2407a2bee99d9001184f5 |
32 +58e24f733a964da346e2407a2bee99d9001184f5 |
30 diff -Npru repo.0d9d9b8dc9a3/normal1 repo/normal1 |
33 diff -Nru repo.0d9d9b8dc9a3/normal1 repo/normal1 |
31 --- repo.0d9d9b8dc9a3/normal1 * (glob) |
34 --- repo.0d9d9b8dc9a3/normal1 * (glob) |
32 +++ repo/normal1 * (glob) |
35 +++ repo/normal1 * (glob) |
33 @@ -1 +1 @@ |
36 @@ -1 +1 @@ |
34 -normal1 |
37 -normal1 |
35 +normal1 in #1 |
38 +normal1 in #1 |