GNU bug report logs - #20878
smerge yours/other are backwards for git stash conflicts

Previous Next

Package: emacs;

Reported by: Glenn Morris <rgm <at> gnu.org>

Date: Tue, 23 Jun 2015 07:11:02 UTC

Severity: minor

Found in version 24.5

Fixed in version 26.1

Done: Glenn Morris <rgm <at> gnu.org>

Bug is archived. No further changes may be made.

Full log

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

From: Glenn Morris <rgm <at> gnu.org>
To: <control <at> debbugs.gnu.org>
Subject: control message for bug 20878
Date: Sat, 30 Jan 2016 22:02:26 -0500

close 20878 25.2
This bug report was last modified 8 years and 223 days ago.

Previous Next

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