##// END OF EJS Templates
configitems: add a new config option to control new filenode functionality...
Pulkit Goyal -
r46153:b9d6ab6c default
parent child Browse files
Show More
@@ -590,6 +590,11 b' coreconfigitem('
590 590 coreconfigitem(
591 591 b'experimental', b'maxdeltachainspan', default=-1,
592 592 )
593 # tracks files which were undeleted (merge might delete them but we explicitly
594 # kept/undeleted them) and creates new filenodes for them
595 coreconfigitem(
596 b'experimental', b'merge-track-salvaged', default=False,
597 )
593 598 coreconfigitem(
594 599 b'experimental', b'mergetempdirprefix', default=None,
595 600 )
@@ -1,3 +1,15 b''
1 #testcases old newfilenode
2
3 #if newfilenode
4 Enable the config option
5 ------------------------
6
7 $ cat >> $HGRCPATH <<EOF
8 > [experimental]
9 > merge-track-salvaged = True
10 > EOF
11 #endif
12
1 13 Criss cross merging
2 14
3 15 $ hg init criss-cross
General Comments 0
You need to be logged in to leave comments. Login now