diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-13 10:41:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-13 10:41:54 -0700 |
| commit | a613b534bca2d56f2ad67b3a7f0cf2b34f031260 (patch) | |
| tree | 2a54a3d0666577bf01234e5771e16dec7ccb240d /diff.h | |
| parent | 4bdbfb15b2d2ad1fbe144dcde386e71bcdff91d0 (diff) | |
| parent | 095ce9538b738db28d5e9a6e05d94c7e3f55f39d (diff) | |
| download | git-a613b534bca2d56f2ad67b3a7f0cf2b34f031260.tar.gz git-a613b534bca2d56f2ad67b3a7f0cf2b34f031260.tar.xz | |
Merge branch 'jc/fix-diff-files-unmerged' into maint
* 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.h | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -208,10 +208,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 |