Junio C Hamano 30fc4688a3 Merge branches 'js/c-merge-recursive' and 'js/read-tree' into next ...

* js/c-merge-recursive:
  merge-recur: use the unpack_trees() interface instead of exec()ing read-tree
  read-tree: move merge functions to the library
  read-trees: refactor the unpack_trees() part
  merge-recur: fix thinko in unique_path()

* js/read-tree:
  read-tree: move merge functions to the library
  read-trees: refactor the unpack_trees() part

2006-07-31 00:12:50 -07:00

25 KiB

Raw Blame History

View Raw