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 /parse-options.h | |
| parent | Merge branch 'mz/maint-rename-unmerged' into maint (diff) | |
| parent | diff-files: show unmerged entries correctly (diff) | |
| download | tgif-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 'parse-options.h')
0 files changed, 0 insertions, 0 deletions