Merge branch 'jc/unpack-trees-reword'

* jc/unpack-trees-reword: unpack-trees: allow Porcelain to give different error messages
2008-05-25 13:38:27 -07:00
parent 29313449f7 8ccba008ee
commit a24d287fb3
3 changed files with 52 additions and 14 deletions
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@ -236,6 +236,8 @@ 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.";
+
 		refresh_cache(REFRESH_QUIET);

 		if (unmerged_cache()) {