admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jc/fix-diff-files-unmerged'

Browse Source 
* jc/fix-diff-files-unmerged:
  diff-files: show unmerged entries correctly
  diff: remove often unused parameters from diff_unmerge()
  diff.c: return filepair from diff_unmerge()
  test: use $_z40 from test-lib
This commit is contained in:
Junio C Hamano
2011-05-06 10:52:58 -07:00
parent 6c252ef79e 095ce9538b
commit 22dbeee715
16 changed files with 120 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
diff.h
View File

@@ -210,10 +210,7 @@ extern void diff_change(struct diff_options *,
const char *fullpath,
unsigned dirty_submodule1, unsigned dirty_submodule2);
extern void diff_unmerge(struct diff_options *,
const char *path,
unsigned mode,
const unsigned char *sha1);
extern struct diff_filepair *diff_unmerge(struct diff_options *, const char *path);
#define DIFF_SETUP_REVERSE 1
#define DIFF_SETUP_USE_CACHE 2