tree cf55bb5fa5718e35b3b2ecc9fc1f35699aac2f67
parent 500b97e4bb184c954a52550843e6314ecf97a208
author Linus Torvalds <torvalds@osdl.org> 1128006972 -0700
committer Junio C Hamano <junkio@cox.net> 1128274966 -0700

read-tree: --trivial

This adds an option --trivial to restrict 3-way 'read-tree -m -u'
to happen only if there is no file-level merging required.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>