i18n: advice: internationalize message for conflicts
[gitweb.git] / t / t9151 /
drwxr-xr-x   parent (dest: t; base: 8785c425320e9288d13f0218e591a8aa5c57479c)
-rwxr-xr-x 7105 make-svnmerge-dump
-rw-r--r-- 48946 svn-mergeinfo.dump