>>> "TH" == Tassilo Horn <[email protected]> writes: > Hi Al, >> Tassilo, can you kindly pull those changes again? Thank you.
> Done! I just pulled (not fetched) I obtained ,---- | remote: Counting objects: 38, done. | remote: Compressing objects: 100% (24/24), done. | remote: Total 38 (delta 28), reused 20 (delta 14) | Unpacking objects: 100% (38/38), done. | From git://git.savannah.gnu.org/auctex | + 7a45bb1...683b9f9 tex-build-only -> origin/tex-build-only (forced update) | 18bc7b6..f9c7245 master -> origin/master | Auto-merging tex.el | CONFLICT (content): Merge conflict in tex.el | Auto-merging tex-buf.el | CONFLICT (content): Merge conflict in tex-buf.el | Automatic merge failed; fix conflicts and then commit the result. | `---- Since I am not a git user (and might have screwed up things when checking out the new tex-build-only branch I will use the advice of the xdbc comics And clone again. But I thought, you should know about it Regards Uwe
smime.p7s
Description: S/MIME cryptographic signature
