t6021: add a new test for git-merge-resolve

diff --git a/command-list.txt b/command-list.txt
index 28342da959faebe5fde82fc4ac6df962fec35a2d..3583a33ee90647d8e6ded02643eb75753760d94f 100644 (file)
--- a/command-list.txt
+++ b/command-list.txt
@@ -91,6 +91,7 @@ git-reflog                              ancillarymanipulators
 git-relink                              ancillarymanipulators
 git-remote                              ancillarymanipulators
 git-repack                              ancillarymanipulators
+git-repo-config                         ancillarymanipulators  deprecated
 git-request-pull                        foreignscminterface
 git-rerere                              ancillaryinterrogators
 git-reset                               mainporcelain common
@@ -98,7 +99,6 @@ git-revert                              mainporcelain
 git-rev-list                            plumbinginterrogators
 git-rev-parse                           ancillaryinterrogators
 git-rm                                  mainporcelain common
-git-runstatus                           ancillaryinterrogators
 git-send-email                          foreignscminterface
 git-send-pack                           synchingrepositories
 git-shell                               synchelpers