diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-08-17 02:09:58 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 14:02:05 -0700 |
| commit | d9a680acf68caef16b5f316ed7917d8160d3578a (patch) | |
| tree | f2d8e508422450ed8dc8575d3191c5cc52beb08b /git-remote-testgit.py | |
| parent | eeb70b6769ad484989c8708a85fef112726a35e1 (diff) | |
merge script: handle many-way octopus
Based on v1.6.0-rc0~51^2~5 (Build in merge, 2008-07-07).
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-remote-testgit.py')
0 files changed, 0 insertions, 0 deletions