Google Git
Sign in
code/git/4353f386166d74fd96cb552900fc22f6df211c21
commit
4353f386166d74fd96cb552900fc22f6df211c21
[log]
author
Fredrik Kuivinen <freku045@student.liu.se>
Sun Jan 29 13:16:08 2006 +0100
committer
Junio C Hamano <junkio@cox.net>
Sun Jan 29 15:00:42 2006 -0800
tree
c63a81a9581166d6bae9f6d5cecc0db49f08dbf6
parent
d37fd03222ad6b38aa6e237f5f191238c0544850 [diff]
merge-recursive: Improve the error message printed when merge(1) isn't found.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
1 file changed
tree: c63a81a9581166d6bae9f6d5cecc0db49f08dbf6
  1. arm/
  2. compat/
  3. Documentation/
  4. mozilla-sha1/
  5. ppc/
  6. t/
  7. templates/
  8. .gitignore
  9. apply.c
  10. blob.c
  11. blob.h
  12. cache.h
  13. cat-file.c
  14. check-ref-format.c
  15. checkout-index.c
  16. clone-pack.c
  17. commit-tree.c
  18. commit.c
  19. commit.h
  20. config.c
  21. connect.c
  22. convert-objects.c
  23. copy.c
  24. COPYING
  25. count-delta.c
  26. count-delta.h
  27. csum-file.c
  28. csum-file.h
  29. ctype.c
  30. daemon.c
  31. date.c
  32. delta.h
  33. describe.c
  34. diff-delta.c
  35. diff-files.c
  36. diff-index.c
  37. diff-stages.c
  38. diff-tree.c
  39. diff.c
  40. diff.h
  41. diffcore-break.c
  42. diffcore-order.c
  43. diffcore-pathspec.c
  44. diffcore-pickaxe.c
  45. diffcore-rename.c
  46. diffcore.h
  47. entry.c
  48. environment.c
  49. epoch.c
  50. epoch.h
  51. fetch-clone.c
  52. fetch-pack.c
  53. fetch.c
  54. fetch.h
  55. fsck-objects.c
  56. get-tar-commit-id.c
  57. git-add.sh
  58. git-am.sh
  59. git-applymbox.sh
  60. git-applypatch.sh
  61. git-archimport.perl
  62. git-bisect.sh
  63. git-branch.sh
  64. git-checkout.sh
  65. git-cherry.sh
  66. git-clone.sh
  67. git-commit.sh
  68. git-compat-util.h
  69. git-count-objects.sh
  70. git-cvsexportcommit.perl
  71. git-cvsimport.perl
  72. git-diff.sh
  73. git-fetch.sh
  74. git-fmt-merge-msg.perl
  75. git-format-patch.sh
  76. git-grep.sh
  77. git-log.sh
  78. git-lost-found.sh
  79. git-ls-remote.sh
  80. git-merge-octopus.sh
  81. git-merge-one-file.sh
  82. git-merge-ours.sh
  83. git-merge-recursive.py
  84. git-merge-resolve.sh
  85. git-merge-stupid.sh
  86. git-merge.sh
  87. git-mv.perl
  88. git-parse-remote.sh
  89. git-prune.sh
  90. git-pull.sh
  91. git-push.sh
  92. git-rebase.sh
  93. git-relink.perl
  94. git-repack.sh
  95. git-request-pull.sh
  96. git-reset.sh
  97. git-resolve.sh
  98. git-revert.sh
  99. git-send-email.perl
  100. git-sh-setup.sh
  101. git-shortlog.perl
  102. git-status.sh
  103. git-svnimport.perl
  104. git-tag.sh
  105. git-verify-tag.sh
  106. GIT-VERSION-GEN
  107. git-whatchanged.sh
  108. git.c
  109. git.spec.in
  110. gitk
  111. gitMergeCommon.py
  112. hash-object.c
  113. http-fetch.c
  114. http-push.c
  115. http.c
  116. http.h
  117. ident.c
  118. index-pack.c
  119. index.c
  120. init-db.c
  121. INSTALL
  122. local-fetch.c
  123. ls-files.c
  124. ls-tree.c
  125. mailinfo.c
  126. mailsplit.c
  127. Makefile
  128. merge-base.c
  129. merge-index.c
  130. mktag.c
  131. name-rev.c
  132. object.c
  133. object.h
  134. pack-check.c
  135. pack-objects.c
  136. pack-redundant.c
  137. pack.h
  138. patch-delta.c
  139. patch-id.c
  140. path.c
  141. peek-remote.c
  142. pkt-line.c
  143. pkt-line.h
  144. prune-packed.c
  145. quote.c
  146. quote.h
  147. read-cache.c
  148. read-tree.c
  149. README
  150. receive-pack.c
  151. refs.c
  152. refs.h
  153. repo-config.c
  154. rev-list.c
  155. rev-parse.c
  156. rsh.c
  157. rsh.h
  158. run-command.c
  159. run-command.h
  160. send-pack.c
  161. server-info.c
  162. setup.c
  163. sha1_file.c
  164. sha1_name.c
  165. shell.c
  166. show-branch.c
  167. show-index.c
  168. ssh-fetch.c
  169. ssh-pull.c
  170. ssh-push.c
  171. ssh-upload.c
  172. strbuf.c
  173. strbuf.h
  174. stripspace.c
  175. symbolic-ref.c
  176. tag.c
  177. tag.h
  178. tar-tree.c
  179. test-date.c
  180. test-delta.c
  181. tree-diff.c
  182. tree.c
  183. tree.h
  184. unpack-file.c
  185. unpack-objects.c
  186. update-index.c
  187. update-ref.c
  188. update-server-info.c
  189. upload-pack.c
  190. usage.c
  191. var.c
  192. verify-pack.c
  193. write-tree.c