diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-08-17 17:57:31 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-08-17 17:57:31 +1000 |
| commit | d7b16113a128ff04134cec4a8e241cf9cd0a49a2 (patch) | |
| tree | ceb35340dd460691cf55c0523766fa82741910d3 /git-merge-resolve.sh | |
| parent | [PATCH] gitk: Make the date/time display configurable (diff) | |
| download | git-d7b16113a128ff04134cec4a8e241cf9cd0a49a2.tar.gz git-d7b16113a128ff04134cec4a8e241cf9cd0a49a2.zip | |
gitk: Fix bug in fix for warning when removing a branch
My fix in commit b1054ac985aebc90c0a78202dab8477b74d7818a was only
half-right, since it ignored the case where the descendent heads of
the head being removed correspond to two or more different commits.
This fixes it. Reported by Mark Levedahl.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions