summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-07-06 22:32:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-07-24 23:05:40 (GMT)
commit15ed07d532db743a2a397a38bacc1f20e54b2c80 (patch)
tree118aa0160e95a6ea5f8f29068ac640922f75b1a2 /builtin
parent1d51eced103f1c3e36beb6c1e01a413660910a50 (diff)
downloadgit-15ed07d532db743a2a397a38bacc1f20e54b2c80.zip
git-15ed07d532db743a2a397a38bacc1f20e54b2c80.tar.gz
git-15ed07d532db743a2a397a38bacc1f20e54b2c80.tar.bz2
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 'builtin')
0 files changed, 0 insertions, 0 deletions