diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-02-15 14:55:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-15 14:55:40 -0800 |
| commit | ae0d0795d736467202d9bfd535942be81529f84e (patch) | |
| tree | c1745c4d7ff506d62e8f4f3d45180937776f5c82 /userdiff.h | |
| parent | Merge branch 'jc/worktree-add-short-help' (diff) | |
| parent | merge-recursive: add explanation for src_entry and dst_entry (diff) | |
| download | tgif-ae0d0795d736467202d9bfd535942be81529f84e.tar.xz | |
Merge branch 'en/merge-recursive-fixes'
* en/merge-recursive-fixes:
merge-recursive: add explanation for src_entry and dst_entry
merge-recursive: fix logic ordering issue
Tighten and correct a few testcases for merging and cherry-picking
Diffstat (limited to 'userdiff.h')
0 files changed, 0 insertions, 0 deletions