diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2009-08-20 20:47:02 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-23 17:13:33 -0700 |
| commit | 32f54ca31747c47f56abb7ae87a6da0f5b8d97c3 (patch) | |
| tree | 1cdcb7ffe0bc59df1f236f0e7dec5bfc9fee7ee2 /git-gui/lib/win32_shortcut.js | |
| parent | c28b3d6e7b0471a02f81324a90b26effae0f4bde (diff) | |
unpack-trees(): carry skip-worktree bit over in merged_entry()
In this code path, we would remove "old" and replace it with "merge".
"old" may have skip-worktree bit, so re-add it to "merge".
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/lib/win32_shortcut.js')
0 files changed, 0 insertions, 0 deletions