write_idx_file: introduce a struct to hold idx customization options

diff --git a/builtin/branch.c b/builtin/branch.c
index 9e546e4a83d07dd6dd4d4b0cb7d23a02c82747fb..fe8f2fcd524cd690c8601d9370079f9d9ea21df3 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -134,7 +134,7 @@ static int branch_merged(int kind, const char *name,
            in_merge_bases(rev, &head_rev, 1) != merged) {
                if (merged)
                        warning("deleting branch '%s' that has been merged to\n"
-                               "         '%s', but it is not yet merged to HEAD.",
+                               "         '%s', but not yet been merged to HEAD.",
                                name, reference_name);
                else
                        warning("not deleting branch '%s' that is not yet merged to\n"