Skip to main content

Browse the archive

https://github.com/git/git
05 April 2024, 19:32:26 UTC
Revision 18eeb5a2650ef4d662f5c9bb888cac8694753ba5 authored by Junio C Hamano on 18 September 2019, 22:23:16 UTC, committed by Junio C Hamano on 18 September 2019, 22:23:16 UTC 
Sync with master
 
* master:
  Third batch
  git-gui: add hotkey to toggle "Amend Last Commit"
  git-gui: add horizontal scrollbar to commit buffer
  git-gui: convert new/amend commit radiobutton to checkbutton
  git-gui: add hotkeys to set widget focus
  git-gui: allow undoing last revert
  git-gui: return early when patch fails to apply
  git-gui: allow reverting selected hunk
  git-gui: allow reverting selected lines
2 parent s 10702dd + 4c86140
Raw File
Tip revision: 18eeb5a2650ef4d662f5c9bb888cac8694753ba5 authored by Junio C Hamano on 18 September 2019, 22:23:16 UTC
Sync with master
Tip revision: 18eeb5a
merge-blobs.h 
#ifndef MERGE_BLOBS_H
#define MERGE_BLOBS_H

struct blob;
struct index_state;

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

#endif /* MERGE_BLOBS_H */
back to top