Andrew's git / gitweb.git / diff
?
Merge branch 'rs/merge-microcleanup' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 10 Sep 2017 08:03:02 +0000 (17:03 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 10 Sep 2017 08:03:02 +0000 (17:03 +0900)
Code clean-up.

* rs/merge-microcleanup:
merge: use skip_prefix()

1  2 
builtin/merge.c patch | diff1 | diff2 | blob | history
diff --cc builtin/merge.c
Simple merge