diff options
| author |  Clemens Buchacher <drizzd@aon.at> | 2009-04-05 02:46:59 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-04-05 00:26:32 -0700 |
| commit | 0eb6574c24241b1e54be1ddff60287544faaf8d8 (patch) | |
| tree | 79aa4a89f881e93d25c3d7a82efd719e97854388 /git-mergetool.sh | |
| parent | add tests for merging with submodules (diff) | |
| download | tgif-0eb6574c24241b1e54be1ddff60287544faaf8d8.tar.xz | |
update cache for conflicting submodule entries
When merging merge bases during a recursive merge we do not want to
leave any unmerged entries. Otherwise we cannot create a temporary
tree for the recursive merge to work with.
We failed to do so in case of a submodule conflict between merge
bases, causing a NULL pointer dereference in the next step of the
recursive merge.
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions