![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 29 Aug 2008 15:16:30 +0000 (08:16 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 31 Aug 2008 02:41:43 +0000 (19:41 -0700) | ||
| commit | 838338cd22c1df53c1460d9239780371a234b242 | |
| tree | 09e9ce2e167f0c89cd77bd6ba86533fd5f18f66f | tree | snapshot |
| parent | e0af48e49682ea3345f932f6b9e7fa7c5e5e611a | commit | diff |
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>
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>
| xdiff/xmerge.c | diff | blob | history |