diff contrib/zsh_completion @ 22030:ecdff28d13e2

mergetools: add a test for premerge --keep It works! No surprise.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 04 Aug 2014 16:50:15 -0700
parents b5ca14163742
children 8d43c6bb38c0
line wrap: on
line diff