resolve-undo: teach "update-index --unresolve" to use resolve-undo info

[git.git] / t / t2030-unresolve-info.sh

diff --git a/t/t2030-unresolve-info.sh b/t/t2030-unresolve-info.sh
index ea65f391c1671b141d2d071aad0f7df7ca4ea4ac..28e2eb1cec4d1fdc7d28c659ee146741e7d4f850 100755 (executable)
--- a/t/t2030-unresolve-info.sh
+++ b/t/t2030-unresolve-info.sh
@@ -108,4 +108,11 @@ test_expect_success 'add records checkout -m undoes' '
        grep "^++<<<<<<<" actual
 '
 
+test_expect_success 'unmerge with plumbing' '
+       prime_resolve_undo &&
+       git update-index --unresolve file &&
+       git ls-files -u >actual &&
+       test $(wc -l <actual) = 3
+'
+
 test_done