Revision c7cb333f60db9b8313da75c2075a3619202e905d authored by Junio C Hamano on 12 March 2014, 20:43:51 UTC, committed by Junio C Hamano on 12 March 2014, 21:08:05 UTC
When we show unmerged paths, we had an artificial 20 columns floor for the width of labels (e.g. "both deleted:") shown next to the pathnames. Depending on the locale, this may result in a label that is too wide when all the label strings are way shorter than 20 columns, or no-op when a label string is longer than 20 columns. Just drop the artificial floor. The screen real estate is better utilized this way when all the strings are shorter. Adjust the tests to this change. Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 8f17f5b
| File | Mode | Size |
|---|---|---|
| araxis | -rw-r--r-- | 392 bytes |
| bc3 | -rw-r--r-- | 401 bytes |
| codecompare | -rw-r--r-- | 387 bytes |
| deltawalker | -rw-r--r-- | 628 bytes |
| diffmerge | -rw-r--r-- | 286 bytes |
| diffuse | -rw-r--r-- | 282 bytes |
| ecmerge | -rw-r--r-- | 340 bytes |
| emerge | -rw-r--r-- | 415 bytes |
| gvimdiff | -rw-r--r-- | 29 bytes |
| gvimdiff2 | -rw-r--r-- | 29 bytes |
| kdiff3 | -rw-r--r-- | 499 bytes |
| kompare | -rw-r--r-- | 83 bytes |
| meld | -rw-r--r-- | 680 bytes |
| opendiff | -rw-r--r-- | 301 bytes |
| p4merge | -rw-r--r-- | 651 bytes |
| tkdiff | -rw-r--r-- | 224 bytes |
| tortoisemerge | -rw-r--r-- | 638 bytes |
| vimdiff | -rw-r--r-- | 625 bytes |
| vimdiff2 | -rw-r--r-- | 29 bytes |
| xxdiff | -rw-r--r-- | 618 bytes |
Computing file changes ...
