X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin%2Fcheckout.c;h=7d1706e0f9a5b866f8d592914ab8cc2330d271a8;hb=08353ebbab2dfdee50a6daa616ec8b6483cb07c8;hp=1994be92c66257da18c31502bda605be170fd092;hpb=8d676d85f772ce3a100b6f0dddd1c34a7e4313cf;p=git.git

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 1994be92c..7d1706e0f 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -373,7 +373,7 @@ static int merge_working_tree(struct checkout_opts *opts,
 		topts.src_index = &the_index;
 		topts.dst_index = &the_index;
 
-		topts.msgs.not_uptodate_file = "You have local changes to '%s'; cannot switch branches.";
+		topts.msgs[ERROR_NOT_UPTODATE_FILE] = "You have local changes to '%s'; cannot switch branches.";
 
 		refresh_cache(REFRESH_QUIET);