Merge branch 'maint'

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 080404769365fef8176c75fff5f526cf6138df6a..1b9b8a8b4ac2baff6b9676bcf23b148f147dac6a 100644 (file)
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -190,7 +190,7 @@ static void show_ru_info(void)
 {
        if (!the_index.resolve_undo)
                return;
-       for_each_string_list(show_one_ru, the_index.resolve_undo, NULL);
+       for_each_string_list(the_index.resolve_undo, show_one_ru, NULL);
 }
 
 static void show_files(struct dir_struct *dir)