diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-06-27 18:21:58 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-30 22:45:51 -0700 |
| commit | e46bbcf6e89e4b1d3d8de1d20d836538ab0f0c85 (patch) | |
| tree | ed37667a4a0f83d46f4403d0c5d28542e4c3f244 /builtin-fmt-merge-msg.c | |
| parent | Add new test to ensure git-merge handles pull.twohead and pull.octopus (diff) | |
| download | git-e46bbcf6e89e4b1d3d8de1d20d836538ab0f0c85.tar.gz git-e46bbcf6e89e4b1d3d8de1d20d836538ab0f0c85.zip | |
Move read_cache_unmerged() to read-cache.c
builtin-read-tree has a read_cache_unmerged() which is useful for other
builtins, for example builtin-merge uses it as well. Move it to
read-cache.c to avoid code duplication.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions