Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ea/merge-code-cleanup'
author
Junio C Hamano
<gitster@pobox.com>
Fri, 19 Jul 2019 18:30:23 +0000
(11:30 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 19 Jul 2019 18:30:23 +0000
(11:30 -0700)
A loop has been rewritten for conciseness and clarity.
* ea/merge-code-cleanup:
builtin/merge.c - cleanup of code in for-cycle that tests strategies
1
2
builtin/merge.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
7b09842
f00abe6
)
diff --cc
builtin/merge.c
Simple merge