diff tests/test-atomictempfile.py @ 22706:ad25986c4cd3

filemerge: introduce :x as short version of internal:x merge tool name "internal:" is so much typing - it is frequently specified on the command line and gives options that are longer than any other I have seen.
author Mads Kiilerich <madski@unity3d.com>
date Sun, 28 Sep 2014 17:15:25 +0200
parents fb9d1c2805ff
children f00f1de16454
line wrap: on
line diff