diff options
| author | Stephen P. Smith <ischis2@cox.net> | 2016-02-16 02:38:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-17 16:53:11 (GMT) |
| commit | 8dc874b2ee61f0c457c4482ed2f202cac55b52ad (patch) | |
| tree | 06b75f7a95b428f85baaa1848764204c67fda9c0 /builtin | |
| parent | a2558fb8e1e387b630312311e1d22c95663da5d0 (diff) | |
| download | git-8dc874b2ee61f0c457c4482ed2f202cac55b52ad.zip git-8dc874b2ee61f0c457c4482ed2f202cac55b52ad.tar.gz git-8dc874b2ee61f0c457c4482ed2f202cac55b52ad.tar.bz2 | |
wt-status.c: set commitable bit if there is a meaningful merge.
The 'commit --dry-run' and 'commit' return values differed if a
conflicted merge had been resolved and the resulting commit would
record the same tree as the parent.
Update show_merge_in_progress to set the commitable bit if conflicts
have been resolved and a merge is in progress.
Signed-off-by: Stephen P. Smith <ischis2@cox.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions