From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 22 Aug 2010 06:26:46 +0000 (-0700)
Subject: Merge branch 'dg/local-mod-error-messages'
X-Git-Tag: v1.7.3-rc0~54
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2eb54692d145a0c2939698302e913975f059ac34;p=git.git

Merge branch 'dg/local-mod-error-messages'

* dg/local-mod-error-messages:
  t7609: test merge and checkout error messages
  unpack_trees: group error messages by type
  merge-recursive: distinguish "removed" and "overwritten" messages
  merge-recursive: porcelain messages for checkout
  Turn unpack_trees_options.msgs into an array + enum

Conflicts:
	t/t3400-rebase.sh
---

2eb54692d145a0c2939698302e913975f059ac34
diff --cc t/t3400-rebase.sh
index a19aeb644,45ef28281..349eebd54
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@@ -151,9 -127,10 +151,10 @@@ test_expect_success 'setup: recover' 
  '
  
  test_expect_success 'Show verbose error when HEAD could not be detached' '
 -     : > B &&
 -     test_must_fail git rebase topic 2> output.err > output.out &&
 -     grep "The following untracked working tree files would be overwritten by checkout:" output.err &&
 -     grep B output.err
 +	>B &&
 +	test_must_fail git rebase topic 2>output.err >output.out &&
- 	grep "Untracked working tree file .B. would be overwritten" output.err
++	grep "The following untracked working tree files would be overwritten by checkout:" output.err &&
++	grep B output.err
  '
  rm -f B