diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-29 15:16:30 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-31 02:41:43 (GMT) |
| commit | 838338cd22c1df53c1460d9239780371a234b242 (patch) | |
| tree | 09e9ce2e167f0c89cd77bd6ba86533fd5f18f66f /builtin-merge-file.c | |
| parent | e0af48e49682ea3345f932f6b9e7fa7c5e5e611a (diff) | |
| download | git-838338cd22c1df53c1460d9239780371a234b242.zip git-838338cd22c1df53c1460d9239780371a234b242.tar.gz git-838338cd22c1df53c1460d9239780371a234b242.tar.bz2 | |
xmerge.c: minimum readability fixups
This replaces hardcoded magic constants with symbolic ones for
readability, and swaps one if/else blocks to better match the
order in which 0/1/2 variables are handled to nearby codepath.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions