diff options
author | Wayne Davison <wayned@samba.org> | 2014-07-31 15:59:32 -0700 |
---|---|---|
committer | Wayne Davison <wayned@samba.org> | 2014-07-31 15:59:32 -0700 |
commit | bc55aa04dfe77d2b680eab2ea74b46f8a29e5ccb (patch) | |
tree | a74e873b76fb01ec85ef0cb00256068f68772e81 /packaging/cull_options | |
parent | f438d5abe08bb9164478111d3e5c11200abb2baf (diff) | |
download | rsync-bc55aa04dfe77d2b680eab2ea74b46f8a29e5ccb.tar.gz rsync-bc55aa04dfe77d2b680eab2ea74b46f8a29e5ccb.tar.bz2 rsync-bc55aa04dfe77d2b680eab2ea74b46f8a29e5ccb.zip |
Set GIT_MERGE_AUTOEDIT=no in the environment.
Diffstat (limited to 'packaging/cull_options')
0 files changed, 0 insertions, 0 deletions