On 05/10/2013 08:59 AM, Stefano Lattarini wrote: > This is just a trick to facilitate the resolution of conflicts in > the upcoming merge of the master branch, where the to-level Makefile
s/to-/top-/ > has been broken up in several per-subdir makefiles fragments (that > are then included by the top-level one, thus keeping the build system > non-recursive). > > * Makefile.sav: New, verbatim copy of the "old" Makefile.am. > * Makefile.am: Make it a symlink to Makefile.sav. > > Signed-off-by: Stefano Lattarini <[email protected]> > --- > Makefile.am | 709 > +---------------------------------------------------------- > Makefile.sav | 708 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 709 insertions(+), 708 deletions(-) > mode change 100644 => 120000 Makefile.am > create mode 100644 Makefile.sav Any reason why git rename detection is not showing this as a rename? -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
