Andrew's git / gitweb.git / commit
?
merge-strategies: avoid implying that "-s theirs" exists
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Sep 2017 05:34:23 +0000 (14:34 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Sep 2017 05:34:23 +0000 (14:34 +0900)
commitc25d98b...a730cbc63033ba3360df2519d43a40cd
tree28a8cc8...488949c0ca6a3563fadc94382758a94bcopy hash to clipboard (tree)
parent0bfff81...6f8c055fd95af4567286929ba8216fa7copy hash to clipboard (diff)
Documentation/merge-strategies.txt diff | blob | history