Re: [PATCH 1/2] rm: better error message on failure for multiple files

@@ -170,30 +175,47 @@ static int check_local_mod(unsigned char *head, int index_only)
                 * "intent to add" entry.
                 */
                if (local_changes && staged_changes) {
-                       if (!index_only || !(ce->ce_flags & CE_INTENT_TO_ADD))
-                               errs = error(_("'%s' has staged content different "
-                                            "from both the file and the HEAD\n"
-                                            "(use -f to force removal)"), name);
+                       if (!index_only || !(ce->ce_flags & CE_INTENT_TO_ADD)) {
+                               strbuf_addstr(&files_staged, "\n        ");