diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-06-10 15:30:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-10 15:30:19 -0700 |
| commit | a28705da929ad746abcb34270947f738549d3246 (patch) | |
| tree | 637e3dc1bd412daaede26e6215f33d008fda01e9 /contrib/examples/git-merge-ours.sh | |
| parent | Merge branch 'jk/diff-compact-heuristic' (diff) | |
| download | tgif-a28705da929ad746abcb34270947f738549d3246.tar.xz | |
Hopefully the final last-minute update before 2.9 final
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