Merge branch 'nd/checkout-f-while-conflicted-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Apr 2019 10:28:07 +0000 (19:28 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Apr 2019 10:28:07 +0000 (19:28 +0900)
commit04f879a...fb86048a0b6e9ea58a4d7d058bffde0b
treec7bf245...6c6c81f0764c517d69f385f551f1a209copy hash to clipboard (tree)
parentfffbf7c...ba3a3653b92329f879d238e6fea4dfcecopy hash to clipboard (diff)
parentab5af82...db8beaf623f8ac95e4b4179ec1b9569ecopy hash to clipboard (diff)