# HG changeset patch # User Matt Harbison # Date 2021-04-27 04:23:05 # Node ID 96d295dd4968218a5ff93460ce589d8f1bc550b8 # Parent c853bc60c5d6635d87df0d42c23cffad9326c27b tests: stabilize test-git-interop.t for some versions of git Not sure why this differs on my system, but it's likely due to running 2.17.1 on Ubuntu 18.04. Differential Revision: https://phab.mercurial-scm.org/D10520 diff --git a/tests/test-git-interop.t b/tests/test-git-interop.t --- a/tests/test-git-interop.t +++ b/tests/test-git-interop.t @@ -67,6 +67,7 @@ Ignore the .hg directory within git: On branch master Untracked files: (use "git add ..." to include in what will be committed) + (?) gamma nothing added to commit but untracked files present (use "git add" to track) @@ -134,6 +135,7 @@ Revert works: On branch master Untracked files: (use "git add ..." to include in what will be committed) + (?) gamma nothing added to commit but untracked files present (use "git add" to track) @@ -153,7 +155,9 @@ Add shows sanely in both: $ git status On branch master Changes to be committed: - (use "git restore --staged ..." to unstage) + (use "git restore --staged ..." to unstage) (?) + (use "git reset HEAD ..." to unstage) (?) + (?) new file: gamma @@ -165,6 +169,7 @@ forget does what it should as well: On branch master Untracked files: (use "git add ..." to include in what will be committed) + (?) gamma nothing added to commit but untracked files present (use "git add" to track)