diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2009-11-09 09:04:58 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-10 10:50:19 -0800 |
| commit | d629c40b0b8b63b0c8b33d52dcba0ed202d898d7 (patch) | |
| tree | 44dfa22511bb28cc62d7d27f32e8d354c4169ed9 /merge-index.c | |
| parent | 6586b1f3465a93e908664ea24fa2f5ff47a587e3 (diff) | |
| download | git-d629c40b0b8b63b0c8b33d52dcba0ed202d898d7.tar.gz | |
merge: do not setup worktree twice
Builtins do not need to run setup_worktree() for themselves, since
the builtin machinery runs it for them.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-index.c')
0 files changed, 0 insertions, 0 deletions