diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-07-06 15:32:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-24 16:05:40 -0700 |
| commit | 15ed07d532db743a2a397a38bacc1f20e54b2c80 (patch) | |
| tree | 118aa0160e95a6ea5f8f29068ac640922f75b1a2 /Documentation/git-p4.txt | |
| parent | rerere: use "struct rerere_id" instead of "char *" for conflict ID (diff) | |
| download | tgif-15ed07d532db743a2a397a38bacc1f20e54b2c80.tar.xz | |
rerere: un-nest merge() further
By consistently using "upon failure, set 'ret' and jump to out"
pattern, flatten the function further.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-p4.txt')
0 files changed, 0 insertions, 0 deletions