| commit | d629c40b0b8b63b0c8b33d52dcba0ed202d898d7 | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Mon, 9 Nov 2009 15:04:58 +0000 (9 09:04 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 10 Nov 2009 18:50:19 +0000 (10 10:50 -0800) | ||
| tree | 44dfa22511bb28cc62d7d27f32e8d354c4169ed9 | treesnapshot (tar.gz zip) |
| parent | 6586b1f3465a93e908664ea24fa2f5ff47a587e3 | commitdiff |
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>
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>
| builtin-merge.c | diffblobblamehistory |