##// END OF EJS Templates
tests: adjust merge tool config in test-largefiles-update.t...
Boris Feld -
r40500:37e75be0 default
parent child Browse files
Show More
@@ -3,9 +3,10 b''
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]
General Comments 0
You need to be logged in to leave comments. Login now