Re: master c6f03ed: Fix a problem in url.el without GnuTLS

[Steinar Bang]

>>>>> Eli Zaretskii <address@hidden>:

> What do you mean by "version number stuff"?

The version of the package itself (eg. AC_INIT in configure.ac and the
line in the README file), and versions of dependencies.

Stuff like the AC_INIT line will usually be taken care of in the first
merge, however if the configure.ac is changed for some reason on the
emacs-24 branch, one should examine the merge results. 

Git tries to be clever in merges, and usually manages to be so, but I've
seen it fail in cases like this (ie. making changes in the file
containing a package's version number).  And in a staged-but-uncommitted
merge in magit, the workflow is simple and emacs-ish:
 - Edit configure.ac (fix the AC_INIT line and keep the rest)
 - 'C-x v =' to check the diff
 - Go back to magit ('q' to close the vc diff, 'C-x b RET' from the
   source file) the unstaged version of the file ('s' in front of the
   file)
 - In magit 'c c' to commit the merge