diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2007-07-29 13:25:14 -0700 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2007-07-29 13:25:14 -0700 |
| commit | 08474ccf68e14f59b4517c6024a9bc6ecbd4a1d5 (patch) | |
| tree | 5c1dc885b4fd33fc48d91a9ce489e24c88c9f3c2 /util/style.py | |
| parent | 4a7d0c4b79450e05b87da4cfc48c2361758127c1 (diff) | |
| parent | 362ff1bcebd78c0c247e435eac657c8a1134b1fb (diff) | |
| download | gem5-08474ccf68e14f59b4517c6024a9bc6ecbd4a1d5.tar.xz | |
Merge Gabe's changes from head.
--HG--
extra : convert_revision : d00b7b09c7f19bc0e37b385ef7c124f69c0e917f
Diffstat (limited to 'util/style.py')
| -rw-r--r-- | util/style.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/style.py b/util/style.py index 7238b9801..3d7336388 100644 --- a/util/style.py +++ b/util/style.py @@ -306,7 +306,7 @@ def check_whitespace(ui, repo, hooktype, node, parent1, parent2): lines = mdiff.splitnewlines(file_data) mod_lines = modified_lines(pctx[0].data(), file_data, len(lines)) if len(pctx) == 2: - m2 = modified_lines(pctx[1].data(), file_data) + m2 = modified_lines(pctx[1].data(), file_data, len(lines)) mod_lines = mod_lines & m2 # only the lines that are new in both fixonly = set() |