summaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2019-05-09 17:10:27 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-05-13 11:49:14 +0900
commitb64335554a3691cbc134fb73a598dfd593f44b4e (patch)
treeacb8599602a92beeeeb5f692a0705535d71d44a5 /.gitmodules
parentmingw: allow building with an MSYS2 runtime v3.x (diff)
downloadtgif-b64335554a3691cbc134fb73a598dfd593f44b4e.tar.xz
merge: remove drop_save() in favor of remove_merge_branch_state()
Both remove_branch_state() and drop_save() delete almost the same set of files about the current merge state. The only difference is MERGE_RR but it should also be cleaned up after a successful merge, which is what drop_save() is for. Make a new function that deletes all merge-related state files and use it instead of drop_save(). This function will also be used in the next patch that introduces --quit. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions