diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-11-12 12:13:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-11-12 12:13:25 -0800 |
| commit | 9c70e2c105f9c4b4708af6ae25d2678929b3d61d (patch) | |
| tree | 2b7cd8b24c654a211ee5e929df1b761213716dd3 /git-merge-octopus.sh | |
| parent | Merge branch 'jk/fetch-reflog-df-conflict' (diff) | |
| parent | Merge branch 'nd/gitignore-trailing-whitespace' into maint (diff) | |
| download | tgif-9c70e2c105f9c4b4708af6ae25d2678929b3d61d.tar.xz | |
Sync with 'maint'
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions