Show More
@@ -3,9 +3,10 | |||
|
3 | 3 | This file focuses mainly on updating largefiles in the working |
|
4 | 4 | directory (and ".hg/largefiles/dirstate") |
|
5 | 5 | |
|
6 | $ unset HGMERGE | |
|
6 | 7 |
$ |
|
7 | 8 | > [ui] |
|
8 |
> merge = internal: |
|
|
9 | > merge = internal:merge | |
|
9 | 10 | > [extensions] |
|
10 | 11 | > largefiles = |
|
11 | 12 | > [extdiff] |
General Comments 0
You need to be logged in to leave comments.
Login now