resolve-undo: teach "update-index --unresolve" to use resolve-undo info
[git/git.git] / t / t2030-unresolve-info.sh
index ea65f39..28e2eb1 100755 (executable)
@@ -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