diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-07-30 22:26:15 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-31 10:31:39 +0400 |
| commit | 076b0adcf9dac7bd9d18624087f679cc811aeb77 (patch) | |
| tree | 99b9d07f74b648b5353a56350247b929efa7acde /git-merge.sh | |
| parent | 16da134b1f9b0fbd1d328999875d34d02e5470b4 (diff) | |
read-tree: move merge functions to the library
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>
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions