facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 07:49:11 +03:00
Code Issues Projects Releases Wiki Activity

Fix typo in merging new files

Browse Source 
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Fix typo in merging new files

manifest hash: 4a6fee1e54c5c465a74f4d756a1ac549b15fdb2f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCuOvVywK+sNU5EO8RArovAJ4ua9EhnO8wWfKRZ36E6F4Wrv5JPACghCXn
sHr/TSkxdy48OUVkhTbhhhQ=
=poww
-----END PGP SIGNATURE-----
This commit is contained in:
mpm@selenic.com 2005-06-21 20:40:53 -08:00
parent e0a4782d31
commit b2a320abcc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mercurial/hg.py
View File

@ -1052,7 +1052,7 @@ class localrepository:
s = 0
# is the wfile new since m1, and match m2?
if n not in m1:
if f not in m1:
t1 = self.wfile(f).read()
t2 = self.file(f).revision(m2[f])
if cmp(t1, t2) == 0: