| commit | 3065125d314a4cb97aa7982e2d06f48759865af7 | |
| author | Ulrich Müller <ulm@gentoo.org> | |
| Sat, 17 Jan 2015 23:06:13 +0000 (18 00:06 +0100) | ||
| committer | Ulrich Müller <ulm@gentoo.org> | |
| Sat, 17 Jan 2015 23:06:13 +0000 (18 00:06 +0100) | ||
| tree | 3a03fa788a77e8317fe9f8c905c62d92af725628 | treesnapshot (tar.gz zip) |
| parent | fd5c0bcc3b5e72e6a6b1f91b3257ef9d9d042fd4 | commitdiff |
Fix mistake in rebase/merge conflict resolution.
Remove lines from lisp/vc/vc-bzr.el again that were accidentally
restored in commit 2015-01-17T09:56:45!ulm@gentoo.org.
(Previously removed in commit 2014-12-01T13:24:27Z!esr@thyrsus.com.)
Remove lines from lisp/vc/vc-bzr.el again that were accidentally
restored in commit 2015-01-17T09:56:45!ulm@gentoo.org.
(Previously removed in commit 2014-12-01T13:24:27Z!esr@thyrsus.com.)
| lisp/vc/vc-bzr.el | diffblobblamehistory |