GNU bug report logs - #20292
24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file

Previous Next

Package: emacs;

Reported by: Eli Zaretskii <eliz <at> gnu.org>

Date: Fri, 10 Apr 2015 12:57:02 UTC

Severity: normal

Merged with 20151

Found in versions 24.5, 25.0.50

Done: Dmitry Gutov <dgutov <at> yandex.ru>

Bug is archived. No further changes may be made.

Full log

Message #213 received at control <at> debbugs.gnu.org (full text, mbox):

From: Junio C Hamano <junio <at> pobox.com>
To: control <at> debbugs.gnu.org
Subject: unarchive 20292
Date: Thu, 27 Oct 2016 10:13:37 -0700

unarchive 20292
This bug report was last modified 8 years and 191 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.