summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-06 10:52:58 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-06 10:52:58 -0700
commit22dbeee715e4c9fae3e3fdc1f3a2c4a6ec90e593 (patch)
tree0091b831de88064187f0ddfd637b8ff93883eded /diff.h
parent6c252ef79e314eef8fca862cca8a63329fa7591c (diff)
parent095ce9538b738db28d5e9a6e05d94c7e3f55f39d (diff)
downloadgit-22dbeee715e4c9fae3e3fdc1f3a2c4a6ec90e593.tar.gz
Merge branch 'jc/fix-diff-files-unmerged'
* 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
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/diff.h b/diff.h
index 6fe1597785..d83e53e9d4 100644
--- a/diff.h
+++ b/diff.h
@@ -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