summaryrefslogtreecommitdiff
path: root/t/t9601/cvsroot/.gitattributes
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2021-03-20 00:03:53 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-03-20 12:35:40 -0700
commit816147e7bab0c7e9c3a578ce166c55d5f7a64a8a (patch)
treea82800e28c2aa563512cd47fa843c37accaf633a /t/t9601/cvsroot/.gitattributes
parentmerge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflict (diff)
downloadtgif-816147e7bab0c7e9c3a578ce166c55d5f7a64a8a.tar.xz
merge-recursive: add a bunch of FIXME comments documenting known bugs
The plan is to just delete merge-recursive, but not until everyone is comfortable with merge-ort as a replacement. Given that I haven't switched all callers of merge-recursive over yet (e.g. git-am still uses merge-recursive), maybe there's some value documenting known bugs in the algorithm in case we end up keeping it or someone wants to dig it up in the future. Signed-off-by: Elijah Newren <newren@gmail.com> Reviewed-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9601/cvsroot/.gitattributes')
0 files changed, 0 insertions, 0 deletions