Use Daniel's read-tree in the merge strategy 'resolve'.
[git] / git-archimport.perl
2005-09-10  martin@catalyst... [PATCH] archimport - add merge detection
2005-09-08  Junio C HamanoBig tool rename.