diff options
author | J. Bruce Fields <bfields@fieldses.org> | 2006-03-26 15:29:28 -0500 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-03-26 19:07:43 -0800 |
commit | 8978d043c35ad068e280dbbdc31e06524ea0ab56 (patch) | |
tree | a2711dcaba671bff89832b4fad304eaad7811883 /merge-base.c | |
parent | Fix error handling for nonexistent names (diff) | |
download | tgif-8978d043c35ad068e280dbbdc31e06524ea0ab56.tar.xz |
Document git-rebase behavior on conflicts.
Diffstat (limited to 'merge-base.c')
0 files changed, 0 insertions, 0 deletions