[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115935: Remove stray conflicty markar that the VCS
|
From: |
Eric S. Raymond |
|
Subject: |
[Emacs-diffs] trunk r115935: Remove stray conflicty markar that the VCS somehow ignored. |
|
Date: |
Thu, 09 Jan 2014 16:49:09 +0000 |
|
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115935
revision-id: address@hidden
parent: address@hidden
committer: Eric S. Raymond <address@hidden>
branch nick: trunk
timestamp: Thu 2014-01-09 11:49:05 -0500
message:
Remove stray conflicty markar that the VCS somehow ignored.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-01-09 16:46:56 +0000
+++ b/lisp/ChangeLog 2014-01-09 16:49:05 +0000
@@ -1,4 +1,3 @@
-<<<<<<< TREE
2014-01-09 Eric S. Raymond <address@hidden>
* vc/vc-git.el (vc-git-print-log): Add --follow option to command,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115935: Remove stray conflicty markar that the VCS somehow ignored.,
Eric S. Raymond <=