Mercurial > hg
comparison tests/test-conflict.t @ 48513:47f2a82ae3e4
rhg: Fall back to Python if verbose status is requested by config
Differential Revision: https://phab.mercurial-scm.org/D11943
| author | Simon Sapin <simon.sapin@octobus.net> |
|---|---|
| date | Sat, 18 Dec 2021 11:47:03 +0100 |
| parents | b7fde9237c92 |
| children | 50de08904c63 |
comparison
equal
deleted
inserted
replaced
| 48512:262a38f10427 | 48513:47f2a82ae3e4 |
|---|---|
| 1 TODO: fix rhg bugs that make this test fail when status is enabled | |
| 2 $ unset RHG_STATUS | |
| 3 | |
| 4 | |
| 5 $ hg init | 1 $ hg init |
| 6 $ cat << EOF > a | 2 $ cat << EOF > a |
| 7 > Small Mathematical Series. | 3 > Small Mathematical Series. |
| 8 > One | 4 > One |
| 9 > Two | 5 > Two |