summaryrefslogtreecommitdiff
path: root/xmerge
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2015-10-20 23:10:36 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2015-10-23 12:31:57 +0200
commit3622c7027af764e21ba48777f746a393e817ac63 (patch)
tree051a291ebb6d69a0e598fa7f45977d1bf0a836a3 /xmerge
parent2b1a5dcc28e142e8305c23b19f254ba24f5af456 (diff)
on unity, default to human if possible
Diffstat (limited to 'xmerge')
0 files changed, 0 insertions, 0 deletions