| commit | eab5a6ee1abff1fbf142cf1558ba940b6d4b270a | [log] [tgz] |
|---|---|---|
| author | Zac Medico <zmedico@gentoo.org> | Tue Sep 06 11:34:57 2011 -0700 |
| committer | Zac Medico <zmedico@gentoo.org> | Tue Sep 06 11:34:57 2011 -0700 |
| tree | 3ff8163bd01c976f106cb372869fb7fbfdd75059 | |
| parent | 8ce21665b856e24815274240011a4aa81826113a [diff] |
merge: avoid abssymlink readlink call This will avoid the "OSError: [Errno 2] No such file or directory" that is triggered inside abssymlink if the merge encoding is not ascii or utf_8, as shown in bug #382021.