Skip to content
  • Orgad Shaneh's avatar
    Git: Make mergetool parsing more robust · 4ed00a34
    Orgad Shaneh authored
    
    
    Symbolic link conflict is printed in 2 phases: First "  {remote}", and
    then "a symbolic link -> 'foo.cpp'".
    
    This happens because this message involves an additional cat process:
    
      elif is_symlink "$mode"
      then
          echo "a symbolic link -> '$(cat "$file")'"
    
    For local/remote line, wait for a full line before parsing.
    
    Change-Id: I641cde12aa44dee2f7dff8fdae70da0c443e55d3
    Reviewed-by: default avatarOrgad Shaneh <orgads@gmail.com>
    4ed00a34