diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-24 00:36:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-18 00:46:13 -0800 |
| commit | 525ab63950e324823dd45423104cdcf5e46e2610 (patch) | |
| tree | 4ab4dcee4a942ad6b0877bfc1f508d34932a339a /diff-lib.c | |
| parent | 3d51e1b5b84bde24f9a19e3cee603f0b57f62001 (diff) | |
| download | git-525ab63950e324823dd45423104cdcf5e46e2610.tar.gz | |
merge-recursive: split low-level merge functions out.
This moves low-level merge functions out of merge-recursive.c and
places them in a new separate file, ll-merge.c
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-lib.c')
0 files changed, 0 insertions, 0 deletions