mercurial/__init__.py
author ronvoe12249 <ronny.voelker@elaxy.com>
Tue, 16 Apr 2013 13:55:38 +0200
changeset 18972 3de9b1f9ebc3
parent 0 9117c6561b0b
child 27220 4374d819ccd5
permissions -rw-r--r--
mergetools: rename 'base' to 'merged' in meld This makes it clear which panel is the target of the merge operation.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines: