diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-04-16 16:15:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-17 17:14:19 -0700 |
| commit | 4c57bd27402353f135250af91d1cc2646db73df0 (patch) | |
| tree | 6c347e0b7a2ce771bb05f783abb0335fdf86a90d /t/t4013/diff.diff-tree_--root_--patch-with-raw_initial | |
| parent | merge tests: octopus with redundant parents (diff) | |
| download | tgif-4c57bd27402353f135250af91d1cc2646db73df0.tar.xz | |
builtin/merge.c: remove "remoteheads" global variable
Instead pass it around starting from the toplevel cmd_merge()
as an explicit parameter.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.diff-tree_--root_--patch-with-raw_initial')
0 files changed, 0 insertions, 0 deletions