DiffMerge 4.2.0 (697...4fcb), Fedora Linux, x86_64
Got this in a three-way merge of text files, resolving a conflict, first merging a block from left into center, then trying to append or re-type the block from the right.
ASSERT INFO:
de_sync_list.cpp(2081): assert "((pDeLineLastT1==NULL) || (pDeLineLastT0==NULL) || (pDeLineLastT2==NULL))" failed in applyIntraLineImportance3(): Coding Error!
BACKTRACE:
[1] g_closure_invoke
[2] g_signal_emit_valist
[3] g_signal_emit
[4] gtk_window_propagate_key_event
[5] g_closure_invoke
[6] g_signal_emit_valist
[7] g_signal_emit
[8] gtk_propagate_event
[9] gtk_main_do_event
[10] g_main_context_dispatch
[11] g_main_loop_run
[12] gtk_main
[13] __libc_start_main
Assert failure when merging
Moderator: SourceGear
Re: Assert failure when merging
What version of Fedora are you using?
Beth Kieler
SourceGear Technical Support
SourceGear Technical Support
-
- Posts: 7
- Joined: Thu Sep 04, 2014 4:52 am
Re: Assert failure when merging
I didn't notice this post until after I made mine, sorry! But I seem to have the same problem, but on OSX. More details in the post I made.
Re: Assert failure when merging
The user on this thread never contacted me back, so I can't say more about that case. I'll continue responding to your post in this location http://support.sourcegear.com/viewtopic ... 33&t=22272, but will keep this one in mind as similar. Thanks for pointing this out.
Beth Kieler
SourceGear Technical Support
SourceGear Technical Support