summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <sbeller@google.com>2018-12-14 15:59:44 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-12-26 10:38:55 -0800
commit820a647e67ad21ecb1d23b2154c44ad13e794443 (patch)
treec9b3a037921415b9fff44f604ed26c868d72881c /mergetools
parentsubmodule: unset core.worktree if no working tree is present (diff)
downloadtgif-820a647e67ad21ecb1d23b2154c44ad13e794443.tar.xz
submodule--helper: fix BUG message in ensure_core_worktree
74d4731da1 (submodule--helper: replace connect-gitdir-workingtree by ensure-core-worktree, 2018-08-13) missed to update the BUG message. Fix it. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions