| commit | e2a2a1daacb43d8296baf155ae6ea0ec6e2f2b8d | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 22 Aug 2017 17:29:14 +0000 (22 10:29 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 22 Aug 2017 17:29:14 +0000 (22 10:29 -0700) | ||
| tree | cdeb97b55d8ffff4588948cabd31e9df135c3ba0 | treesnapshot (tar.gz zip) |
| parent | 2d68161a230a6a713ac0f4ad68c51cc856e83338 | commitdiff |
| parent | de3ce210edb4870b082fab18148f859d2b3c9ae2 | commitdiff |
Merge branch 'rs/merge-microcleanup'
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 |