[Top][All Lists]

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

Re: Resuming M-x gitmerge

From: Noam Postavsky
Subject: Re: Resuming M-x gitmerge
Date: Mon, 18 Jun 2018 20:27:57 -0400

On 11 June 2018 at 20:48, Noam Postavsky <address@hidden> wrote:

> Oh, I see what it is. The reason it doesn't work for me is that I use
> git-worktree, so the .git/MERGE_HEAD test gives the wrong answer. And
> now I see that gitmerge-resolve does actually do 'git add' if needed,
> so the current message is actually perfectly fine. The attached lets
> it work for me, I think that should cover everything.

Pushed to master.

[1: 5498acb5a2]: 2018-06-18 20:02:04 -0400
  Stop assuming .git is a directory in gitmerge.el

reply via email to

[Prev in Thread] Current Thread [Next in Thread]