Junio C Hamano 1b1fdf8c2f read-tree --aggressive ...

A new flag --aggressive resolves what we traditionally resolved
with external git-merge-one-file inside index while read-tree
3-way merge works.

git-merge-octopus and git-merge-resolve use this flag before
running git-merge-index with git-merge-one-file.

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

2006-02-06 21:43:27 -08:00

2.4 KiB

Executable File

Raw Blame History

View Raw