Re: [PATCH v7 0/8] Fix scissors bug during conflict

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Subject: Re: [PATCH v7 0/8] Fix scissors bug during conflict
From: Junio C Hamano <gitster@xxxxxxxxx>
Date: Mon, 11 Mar 2019 15:44:15 +0900
Cc: Git Mailing List <git@xxxxxxxxxxxxxxx>, Phillip Wood <phillip.wood123@xxxxxxxxx>
In-reply-to: <cover.1552275703.git.liu.denton@gmail.com> (Denton Liu's message of "Sun, 10 Mar 2019 20:42:27 -0700")
References: <cover.1548219737.git.liu.denton@gmail.com> <cover.1552275703.git.liu.denton@gmail.com>
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux)

Denton Liu <liu.denton@xxxxxxxxx> writes:

> This is a complete replacement for dl/merge-cleanup-scissors-fix.

Thanks; will take a look and requeue.

References:
- [PATCH v6 0/4] Add git-merge --cleanup support
  - From: Denton Liu
- [PATCH v7 0/8] Fix scissors bug during conflict
  - From: Denton Liu

Prev by Date: Re: [PATCH v5 1/1] worktree add: sanitize worktree names
Next by Date: Re: [PATCH 1/2] legacy stash: fix "rudimentary backport of -q"
Previous by thread: Re: [PATCH v7 8/8] cherry-pick/revert: add scissors line on merge conflict
Next by thread: [PATCH v8 00/11] Fix scissors bug during conflict
Index(es):
- Date
- Thread

[Index of Archives] [Linux Kernel Development] [Gcc Help] [IETF Annouce] [DCCP] [Netdev] [Networking] [Security] [V4L] [Bugtraq] [Yosemite] [MIPS Linux] [ARM Linux] [Linux Security] [Linux RAID] [Linux SCSI] [Fedora Users]

Powered by Linux