summaryrefslogtreecommitdiff
path: root/branch.h
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2011-08-12 05:19:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-14 21:19:35 (GMT)
commit70cc3d36eba58f8bf177c91d82781fb727a9a4fa (patch)
tree358742f2adb54e44bd2de52222a474760050e99a /branch.h
parentf2507b4e0ef0b7fc8c1e75004e8a86a0430dc512 (diff)
downloadgit-70cc3d36eba58f8bf177c91d82781fb727a9a4fa.zip
git-70cc3d36eba58f8bf177c91d82781fb727a9a4fa.tar.gz
git-70cc3d36eba58f8bf177c91d82781fb727a9a4fa.tar.bz2
merge-recursive: Save D/F conflict filenames instead of unlinking them
Rename make_room_for_directories_of_df_conflicts() to record_df_conflict_files() to reflect the change in functionality. 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