« Previous | Next » 

Revision 8bc9e04a

ID8bc9e04a21457c4188475dc849d0d7d1e22ee929
Parent 0dfa2c22
Child dc384cf0

Added by Iustin Pop over 11 years ago

Add temporary dir/file for htools import

In order for “git merge -s recursive -X subtree=htools” to do its
magic, an (mostly empty) directory must exist in the target tree name
‘htools’. Hence we add a temp file to it before the merge, and remove
it after that.

Signed-off-by: Iustin Pop <>
Reviewed-by: Michael Hanselmann <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted

View differences