fix bogus error when 'got cherrypick' merges changes into a locally added file
treea1851525ae826bdc291f3ebbb140289f18cf6bda
-rw-r--r-- 7 .gitignore
-rw-r--r-- 31802 CHANGES
-rw-r--r-- 786 LICENCE
-rw-r--r-- 909 Makefile
-rw-r--r-- 638 Makefile.inc
-rw-r--r-- 6355 README
-rw-r--r-- 1366 TODO
-rw-r--r-- 6524 got-dist.txt
-rw-r--r-- 155 got-version.mk
drwxr-xr-x - got
drwxr-xr-x - gotadmin
drwxr-xr-x - gotweb
drwxr-xr-x - include
drwxr-xr-x - lib
drwxr-xr-x - libexec
drwxr-xr-x - regress
drwxr-xr-x - tog
drwxr-xr-x - util