diff options
| author |  Elijah Newren <newren@gmail.com> | 2017-12-21 11:19:06 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-12-22 12:20:29 -0800 |
| commit | b101793c431b858e49b909bb309a87145fb7348c (patch) | |
| tree | a5f796c240fb006d4adb2ff7c63a636888c73b85 /git-mergetool.sh | |
| parent | t6044: recursive can silently incorporate dirty changes in a merge (diff) | |
| download | tgif-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 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions