diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-25 20:38:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-25 20:38:27 (GMT) |
| commit | a24d287fb305949d9eb534bf3216c0c6a7b4392f (patch) | |
| tree | 3c6c6087fd6d50def5c104332e19d3550df359b0 /builtin-checkout.c | |
| parent | 29313449f726f13ecc562cea9856645eade8e3e9 (diff) | |
| parent | 8ccba008ee3e0b0582e64cb23ae4ebf734b9f75b (diff) | |
| download | git-a24d287fb305949d9eb534bf3216c0c6a7b4392f.zip git-a24d287fb305949d9eb534bf3216c0c6a7b4392f.tar.gz git-a24d287fb305949d9eb534bf3216c0c6a7b4392f.tar.bz2 | |
Merge branch 'jc/unpack-trees-reword'
* jc/unpack-trees-reword:
unpack-trees: allow Porcelain to give different error messages
Diffstat (limited to 'builtin-checkout.c')
| -rw-r--r-- | builtin-checkout.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c index 05c0642..68fffd2 100644 --- 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()) { |