diff options
| author | Eldar Nugaev <enugaev@griddynamics.com> | 2011-05-20 13:29:54 +0400 |
|---|---|---|
| committer | Eldar Nugaev <enugaev@griddynamics.com> | 2011-05-20 13:29:54 +0400 |
| commit | 6eaaf3183c02df38a6258ad8223bd02d1613e2e5 (patch) | |
| tree | 800128af5f0762082b146e33f9b055718c0acb6f /bin/stack | |
| parent | 15bd0664acfeba6322e4c26f04d5f8a5cc4802f5 (diff) | |
| parent | ff35d64de0228ed0ce7f0e617289d4423935fa3d (diff) | |
| download | nova-6eaaf3183c02df38a6258ad8223bd02d1613e2e5.tar.gz nova-6eaaf3183c02df38a6258ad8223bd02d1613e2e5.tar.xz nova-6eaaf3183c02df38a6258ad8223bd02d1613e2e5.zip | |
Merge and conflict resolving
Diffstat (limited to 'bin/stack')
| -rwxr-xr-x | bin/stack | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -65,7 +65,7 @@ def format_help(d): indent = MAX_INDENT - 6 out = [] - for k, v in d.iteritems(): + for k, v in sorted(d.iteritems()): if (len(k) + 6) > MAX_INDENT: out.extend([' %s' % k]) initial_indent = ' ' * (indent + 6) |