summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-25 22:17:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-25 22:17:15 (GMT)
commit5b715ec48fe616b443abd87ff038c94c64fc1063 (patch)
tree763b764fce8ea6132ab117daaf5400799b2106c2 /builtin/merge.c
parenta0c4ddf6776dfcd9ea778e22abf1fbdcfa56d3aa (diff)
parent890fca84be9d2419939f64872648ebe79e68a0b2 (diff)
downloadgit-5b715ec48fe616b443abd87ff038c94c64fc1063.zip
git-5b715ec48fe616b443abd87ff038c94c64fc1063.tar.gz
git-5b715ec48fe616b443abd87ff038c94c64fc1063.tar.bz2
Merge branch 'jc/rerere-multi'
"git rerere" can encounter two or more files with the same conflict signature that have to be resolved in different ways, but there was no way to record these separate resolutions. * jc/rerere-multi: rerere: adjust 'forget' to multi-variant world order rerere: split code to call ll_merge() further rerere: move code related to "forget" together rerere: gc and clear rerere: do use multiple variants t4200: rerere a merge with two identical conflicts rerere: allow multiple variants to exist rerere: delay the recording of preimage rerere: handle leftover rr-cache/$ID directory and postimage files rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id rerere: split conflict ID further
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions