Skip to content

Commit

Permalink
read-tree: move merge functions to the library
Browse files Browse the repository at this point in the history 
This will allow merge-recursive to use the read-tree functionality
without exec()ing git-read-tree.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Johannes Schindelin authored and Junio C Hamano committed Jul 31, 2006
1 parent 16da134 commit 076b0ad
Show file tree
Hide file tree
Showing 3 changed files with 410 additions and 397 deletions.
Loading

0 comments on commit 076b0ad

Please sign in to comment.