diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-17 18:31:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-18 00:14:19 (GMT) |
| commit | b5d887f90692515a6e9c99e7683533d12df3ade2 (patch) | |
| tree | f377b585cd6f9bf6dc49a1fd90898269edc14d4f /t/t6028-merge-up-to-date.sh | |
| parent | 4c57bd27402353f135250af91d1cc2646db73df0 (diff) | |
| download | git-b5d887f90692515a6e9c99e7683533d12df3ade2.zip git-b5d887f90692515a6e9c99e7683533d12df3ade2.tar.gz git-b5d887f90692515a6e9c99e7683533d12df3ade2.tar.bz2 | |
builtin/merge.c: collect other parents early
Move the code around to populate remoteheads list early in the process
before any decision regarding twohead vs octopus and fast-forwardness is
made.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6028-merge-up-to-date.sh')
0 files changed, 0 insertions, 0 deletions