diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-06 21:52:58 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-06 21:52:58 +0400 |
| commit | 22dbeee715e4c9fae3e3fdc1f3a2c4a6ec90e593 (patch) | |
| tree | 0091b831de88064187f0ddfd637b8ff93883eded /git-merge-one-file.sh | |
| parent | 6c252ef79e314eef8fca862cca8a63329fa7591c (diff) | |
| parent | 095ce9538b738db28d5e9a6e05d94c7e3f55f39d (diff) | |
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 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions