| commit | afa6608b930b722dbf93dfc44f4cc225862d33ed | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 10 Sep 2017 08:03:02 +0000 (10 17:03 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 10 Sep 2017 08:03:02 +0000 (10 17:03 +0900) | ||
| tree | 311805d7eba49ea7f480134aee0d1b78b9fbe524 | treesnapshot (tar.gz zip) |
| parent | c580ce194fc1a62b676190a3300fde4c6ba58380 | commitdiff |
| parent | de3ce210edb4870b082fab18148f859d2b3c9ae2 | commitdiff |
Merge branch 'rs/merge-microcleanup' into maint
Code clean-up.
* rs/merge-microcleanup:
merge: use skip_prefix()
Code clean-up.
* rs/merge-microcleanup:
merge: use skip_prefix()
| builtin/merge.c | diff1 | diff2 | blobhistory |