@matheusbsbs / matheus-bagliano / commits / d0a75a179e
Fork 0

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.

Junio C Hamano committed Nov 7, 2006 at 15:41 UTC d0a75a179e0e872c47d4a25350565a8c7c04dd0b

No changes.