diff options
| author |  Elijah Newren <newren@gmail.com> | 2011-08-11 23:20:12 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:38 -0700 |
| commit | 6bdaead1e58ab2aa3ea81a998117d1d5afb41a3b (patch) | |
| tree | 1aadf8ee8f5930394a4aa967d5aca09d40682b39 /branch.h | |
| parent | merge-recursive: Fix modify/delete resolution in the recursive case (diff) | |
| download | tgif-6bdaead1e58ab2aa3ea81a998117d1d5afb41a3b.tar.xz | |
merge-recursive: Introduce a merge_file convenience function
merge_file previously required diff_filespec arguments, but all callers
only had sha1s and modes. Rename merge_file to merge_file_1 and introduce
a new merge_file convenience function which takes the sha1s and modes and
creates the temporary diff_filespec variables needed to call merge_file_1.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'branch.h')
0 files changed, 0 insertions, 0 deletions