equal
deleted
inserted
replaced
1 #require no-reposimplestore |
1 #require no-reposimplestore |
2 |
2 |
3 This file focuses mainly on updating largefiles in the working |
3 This file focuses mainly on updating largefiles in the working |
4 directory (and ".hg/largefiles/dirstate") |
4 directory (and ".hg/largefiles/dirstate") |
5 |
5 |
|
6 $ unset HGMERGE |
6 $ cat >> $HGRCPATH <<EOF |
7 $ cat >> $HGRCPATH <<EOF |
7 > [ui] |
8 > [ui] |
8 > merge = internal:fail |
9 > merge = internal:merge |
9 > [extensions] |
10 > [extensions] |
10 > largefiles = |
11 > largefiles = |
11 > [extdiff] |
12 > [extdiff] |
12 > # for portability: |
13 > # for portability: |
13 > pdiff = sh "$RUNTESTDIR/pdiff" |
14 > pdiff = sh "$RUNTESTDIR/pdiff" |