diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-09-01 16:31:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-01 16:31:07 -0700 |
| commit | 91d54694a4e1da804063ce64b9757d5d3148e6ad (patch) | |
| tree | 76e7ad71adb050aff775e1049455493c9b1952ae /xdiff-interface.h | |
| parent | Eighth batch for 2.6 (diff) | |
| parent | setup: update the right file in multiple checkouts (diff) | |
| download | tgif-91d54694a4e1da804063ce64b9757d5d3148e6ad.tar.xz | |
Merge branch 'nd/fixup-linked-gitdir'
The code in "multiple-worktree" support that attempted to recover
from an inconsistent state updated an incorrect file.
* nd/fixup-linked-gitdir:
setup: update the right file in multiple checkouts
Diffstat (limited to 'xdiff-interface.h')
0 files changed, 0 insertions, 0 deletions