From: Junio C Hamano <junkio@cox.net>
Date: Tue, 7 Nov 2006 23:41:34 +0000 (-0800)
Subject: Merge branch 'jc/read-tree'
X-Git-Tag: v1.4.4-rc1~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d0a75a179e0e872c47d4a25350565a8c7c04dd0b;p=git.git

Merge branch 'jc/read-tree'

* jc/read-tree:
  t6022: ignoring untracked files by merge-recursive when they do not matter
  merge-recursive: adjust to loosened "working file clobbered" check
  merge-recursive: make a few functions static.
  merge-recursive: use abbreviated commit object name.
  merge: loosen overcautious "working file will be lost" check.
---

d0a75a179e0e872c47d4a25350565a8c7c04dd0b