aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2017-12-21 11:19:06 -0800
committerJunio C Hamano <gitster@pobox.com>2017-12-22 12:20:29 -0800
commitb101793c431b858e49b909bb309a87145fb7348c (patch)
treea5f796c240fb006d4adb2ff7c63a636888c73b85 /merge-recursive.c
parenteab3f2850e7cc63a8087fbeae608a1b72ea70c7b (diff)
downloadgit-b101793c431b858e49b909bb309a87145fb7348c.tar.gz
git-b101793c431b858e49b909bb309a87145fb7348c.tar.xz
move index_has_changes() from builtin/am.c to merge.c for reuse
index_has_changes() is a function we want to reuse outside of just am, making it also available for merge-recursive and merge-ort. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions