diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-12-06 09:10:35 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-06 09:10:35 -0800 |
| commit | 3013dff8662eae06457fe6e5348dfe2270810ab2 (patch) | |
| tree | d35df35b9733badb3aa86000132595b6668172ae /contrib/examples/git-merge-ours.sh | |
| parent | Merge branch 'jc/merge-base-fork-point-doc' into maint (diff) | |
| download | tgif-3013dff8662eae06457fe6e5348dfe2270810ab2.tar.xz | |
Prepare for 2.15.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/examples/git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions