Merge branch 'rs/use-xstrncmpz'

Code clean-up.

* rs/use-xstrncmpz:
  use xstrncmpz()

diff --cc builtin/merge.c
Simple merge

diff --cc merge-ll.c
Simple merge

diff --cc remote.c
Simple merge