diff options
| author | Elijah Newren <newren@gmail.com> | 2010-10-03 14:00:02 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-06 13:26:11 -0700 |
| commit | 315e76540baa8b2c1887ea1ee0827dcbcda3e267 (patch) | |
| tree | 911730d2f0de4133115fc89e226754b0d62be704 /ll-merge.c | |
| parent | dd0c69e95638d49f576c3774b8073b68d82ec0ff (diff) | |
| download | git-315e76540baa8b2c1887ea1ee0827dcbcda3e267.tar.gz | |
t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing &&
Also, replace "|| return 1" with "&&" in order to keep commands chained.
Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions