fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Poprawione numery wersów w widoku do druku.
[redakcja.git]
/
lib
/
wlrepo
/
mercurial_backend
/
document.py
diff --git
a/lib/wlrepo/mercurial_backend/document.py
b/lib/wlrepo/mercurial_backend/document.py
index
a579fb7
..
e714561
100644
(file)
--- a/
lib/wlrepo/mercurial_backend/document.py
+++ b/
lib/wlrepo/mercurial_backend/document.py
@@
-189,7
+189,7
@@
class MercurialDocument(wlrepo.Document):
return False
if changed:
- local =
local.latest()
+ local =
self.latest()._revision
success, changed = main.merge_with(local, user=user,\
message=message)