diff options
| author | Dmitri Pal <dpal@redhat.com> | 2010-12-25 23:29:05 -0500 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2012-04-05 11:20:08 -0700 |
| commit | 6aa1f3b84bc42d98916ec6410d5901c1bd46041d (patch) | |
| tree | df7b6c66809d09e72cb35b2badad2ae8d7d9f836 /refarray | |
| parent | 142396b25e68e254f7bc3478d9467158f0fb0eb7 (diff) | |
| download | ding-libs-6aa1f3b84bc42d98916ec6410d5901c1bd46041d.tar.gz ding-libs-6aa1f3b84bc42d98916ec6410d5901c1bd46041d.tar.xz ding-libs-6aa1f3b84bc42d98916ec6410d5901c1bd46041d.zip | |
New merge flags
Adding "DETECT" merge modes.
These modes would be useable for dry run cases to detect
if there are any potential merge conflicts.
Patch just defines new constans and adds input checks.
Diffstat (limited to 'refarray')
0 files changed, 0 insertions, 0 deletions