Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision b9718d41c7e9c171e432bafac97a33be36f0e2bf authored by Junio C Hamano on 17 July 2006, 08:08:11 UTC, committed by Junio C Hamano on 17 July 2006, 08:08:11 UTC 
Merge branch 'sp/reflog'
 
* sp/reflog:
  Record rebase changes as 'rebase' in the reflog.
  Log ref changes made by resolve.
  Log ref changes made by quiltimport.
  Log ref changes made by git-merge and git-pull.
2 parent s 7b520e6 + 8ef1c7c
Raw File
Tip revision: b9718d41c7e9c171e432bafac97a33be36f0e2bf authored by Junio C Hamano on 17 July 2006, 08:08:11 UTC
Merge branch 'sp/reflog'
Tip revision: b9718d4
xdiff-interface.h 
#ifndef XDIFF_INTERFACE_H
#define XDIFF_INTERFACE_H

#include "xdiff/xdiff.h"

struct xdiff_emit_state;

typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long);

struct xdiff_emit_state {
	xdiff_emit_consume_fn consume;
	char *remainder;
	unsigned long remainder_size;
};

int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf);
int parse_hunk_header(char *line, int len,
		      int *ob, int *on,
		      int *nb, int *nn);

#endif
back to top