Finally^2 (If we continue with this speed, we might have it merged around the time we are retired ;-)
I resolved the merge conflicts by merging master into this branch. It might not be clear what exactly I did, so:
6f69211#diff-4ff0e4c5d80fdb5e2e0e3f4352cfbb87
seemed to be fixed upstream so I kept the version from this pull request and discarded your patch.
63850b3#diff-dea5ae7be33b3111ef5fc7a75dde7cbd
in parse.c - I didn't find this function in current ctags master so this code will probably be removed in the future ctags sync.
dbd0573#diff-dea5ae7be33b3111ef5fc7a75dde7cbd
to the corresponding function where this code is now.
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub, or mute the thread.