Use Daniel's read-tree in the merge strategy 'resolve'.
[git] / git-branch.sh
2005-09-08  Amos Waterland[PATCH] Do not create bogus branch from flag to git...
2005-09-08  Junio C HamanoBig tool rename.