Adapt git-merge option when git version greater then 2.9
authorJun Wang <junbill.wang@samsung.com>
Tue, 20 Dec 2016 08:05:32 +0000 (16:05 +0800)
committerSoonKyu Park <sk7.park@samsung.com>
Mon, 26 Dec 2016 13:23:22 +0000 (22:23 +0900)
commit10bbc5251e92550332f402c716e0f4e7bbfdffd5
tree746ed0a70c035a794fc39fa763ab7994a15b1833
parentc8c57f2042648a95ef80cfbc16b880bebdcb8ed2
Adapt git-merge option when git version greater then 2.9

Change-Id: Icd9cb9edc8517095984c0a0f497173e2f068aa20
gbp/git/repository.py