- don't try to merge files if they have binary content
authorDr. Peter Poeml <poeml@cmdline.net>
Thu, 22 Jun 2006 12:54:58 +0000 (12:54 +0000)
committerDr. Peter Poeml <poeml@cmdline.net>
Thu, 22 Jun 2006 12:54:58 +0000 (12:54 +0000)
commitb0d1a9476239dad63ff67fd2303e0a49a7324fab
tree51c6632d71b34330ef895a965848bb4d89e9fe35
parent0e4348e8fc7e2c95444606505defbd3eea1bd462
- don't try to merge files if they have binary content
- set mtime on files that have been fetched during merge
osc/core.py