Hi,
Actually I'm not sure what I messed up, but I cleaned up every trace of the
merge driver and re-installed it, and now it doesn't crash anymore.
Sorry for wasting your time.
Rolf
> Hi,
>
> Rolf Bjarne Kvinge wrote:
>> Attached are three files (o-file, a-file and b-
Hi again,
My typical use case is this:
I work with git-svn, and have two branches, master, which tracks the remote svn
repository, and a branch I work on 'work-branch'.
work-branch is always rebased with master before doing anything else, so
work-branch contains master + my work
Now i cherry-
Hi,
Attached are three files (o-file, a-file and b-file) which when run with
git-merge-changelog causes an assertion in:
#3 0x08049985 in main (argc=Cannot access memory at address 0x34a6) at
git-merge-changelog.c:1469
1469ASSERT (entry_equals
(ancestor_fil
Hi,
Attached are three files (o-file, a-file and b-file) which when run with
git-merge-changelog causes an assertion in:
#3 0x08049985 in main (argc=Cannot access memory at address 0x34a6) at
git-merge-changelog.c:1469
1469ASSERT (entry_equals
(ancestor_f
