##// END OF EJS Templates
tweakdefaults: make hg resolve require --re-merge flag to re-merge...
Valentin Gatien-Baron -
r42764:44e99811 default
parent child Browse files
Show More
@@ -68,6 +68,8 b' grep.all-files = True'
68 update.check = noconflict
68 update.check = noconflict
69 # Show conflicts information in `hg status`
69 # Show conflicts information in `hg status`
70 status.verbose = True
70 status.verbose = True
71 # Make `hg resolve` with no action (like `-m`) fail instead of re-merging.
72 resolve.explicit-re-merge = True
71
73
72 [diff]
74 [diff]
73 git = 1
75 git = 1
General Comments 0
You need to be logged in to leave comments. Login now