facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-05 14:28:17 +03:00
Code Issues Projects Releases Wiki Activity

revert test-merge-tools.t

Browse Source 
Summary: This wasn't passing after my recent change to enable native status in more tests. Not sure why I committed or how it landed.

Reviewed By: sggutier

Differential Revision: D42926501

fbshipit-source-id: 2fb8179ba578e8ce61aca6ab2ea3c077dbfc158e
This commit is contained in:
Muir Manders 2023-02-01 10:08:38 -08:00 committed by Facebook GitHub Bot
parent faea84aa15
commit 972ea94d27
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
eden/scm/tests/test-merge-tools.t
View File

@ -1,5 +1,6 @@
#chg-compatible
$ setconfig status.use-rust=False workingcopy.use-rust=False
$ setconfig devel.segmented-changelog-rev-compat=true
$ setconfig workingcopy.ruststatus=False
$ disable treemanifest
@ -7,8 +8,8 @@
test merge-tools configuration - mostly exercising filemerge.py
$ unset HGMERGE # make sure HGMERGE doesn't interfere with the test
$ configure modern
$ newclientrepo repo
$ hg init repo
$ cd repo
revision 0