Skip to main content

Browse the archive

Revision c00e1c59d8be28acb505e66eb32757c95b1aa840 authored by Junio C Hamano on 12 January 2015, 19:38:23 UTC, committed by Junio C Hamano on 12 January 2015, 19:38:28 UTC 
Merge branch 'es/checkout-index-temp'
 
"git checkout-index --temp=$target $path" did not work correctly
for paths outside the current subdirectory in the project.

* es/checkout-index-temp:
  checkout-index: fix --temp relative path mangling
  t2004: demonstrate broken relative path printing
  t2004: standardize file naming in symlink test
  t2004: drop unnecessary write-tree/read-tree
  t2004: modernize style
2 parent s 42618bc + 74c4de5
Raw File
merge-blobs.h 
#ifndef MERGE_BLOBS_H
#define MERGE_BLOBS_H

#include "blob.h"

extern void *merge_blobs(const char *, struct blob *, struct blob *, struct blob *, unsigned long *);

#endif /* MERGE_BLOBS_H */
back to top