mirrors/jgit - jgit - source @ dussan.org

5120 コミット

49 ブランチ

ツリー: f7e233e450

コミットグラフ

作成者	SHA1	メッセージ	日付
Mathieu Cartaud	f7e233e450	Support -merge attribute in binary macro The merger is now able to react to the use of the merge attribute. The value unset and the custom value 'binary' are handled (-merge and merge=binary) Since the specification of the merge attribute states that when the attribute is unset, ours version must be kept in case of a conflict, we don't overwrite the file but keep the local version. Bug: 517128 Change-Id: Ib5fbf17bdaf727bc5d0e106ce88f2620d9f87a6f Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	7年前

作成者

SHA1

メッセージ

日付

Mathieu Cartaud

f7e233e450

Support -merge attribute in binary macro

The merger is now able to react to the use of the merge attribute.
The value unset and the custom value 'binary' are handled (-merge
and merge=binary)

Since the specification of the merge attribute states that when the
attribute is unset, ours version must be kept in case of a conflict, we
don't overwrite the file but keep the local version.

Bug: 517128
Change-Id: Ib5fbf17bdaf727bc5d0e106ce88f2620d9f87a6f
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>

7年前

1 コミット (f7e233e4500e257a8d1f09d69c0966be266b6f1e)