Junio C Hamano 5c21ac0e7c Libified diff-index: backward compatibility fix. ...

"diff-index -m" does not mean "do not ignore merges", but means
"pretend missing files match the index".

The previous round tried to address this, but failed because
setup_revisions() ate "-m" flag before the caller had a chance
to intervene.

Signed-off-by: Junio C Hamano <junkio@cox.net>

2006-04-22 04:03:32 -07:00

7.9 KiB

Raw Blame History

View Raw