diff options
| author | Carlos Rica <jasampler@gmail.com> | 2007-09-11 05:17:28 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-26 13:42:10 -0700 |
| commit | 102c2338da0b0954a04742f5cbe307fa6b49f225 (patch) | |
| tree | 9f8ce90c6b32050761f10783a9b7bbb2aea286a0 /git-merge-resolve.sh | |
| parent | bce92405aebf217a4738bab0df89516910818e68 (diff) | |
| download | git-102c2338da0b0954a04742f5cbe307fa6b49f225.tar.gz git-102c2338da0b0954a04742f5cbe307fa6b49f225.tar.xz | |
Move make_cache_entry() from merge-recursive.c into read-cache.c
The function make_cache_entry() is too useful to be hidden away in
merge-recursive. So move it to libgit.a (exposing it via cache.h).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions