pull: check if in unresolved merge state
authorPaul Tan <pyokagan@gmail.com>
Thu, 18 Jun 2015 10:54:04 +0000 (18:54 +0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Jun 2015 20:17:16 +0000 (13:17 -0700)
commit4a4cf9e...21f604b79817bc37b475828f3fb8b0a4
tree99cb30b...03852e51ee2a2077c8a26815cfdc40abcopy hash to clipboard (tree)
parenta9de989...5479ef7d42986db63c16251c1f87ebcbcopy hash to clipboard (diff)
advice.c
advice.h
builtin/pull.c