Google Git
Sign in
googlers / jrn / git / b8ba1535bda7bd553f46ea57bdbcee1c90e500a0
commitb8ba1535bda7bd553f46ea57bdbcee1c90e500a0[log] [tgz]
authorJunio C Hamano <junkio@cox.net>Mon Apr 02 16:29:56 2007 -0700
committerJunio C Hamano <junkio@cox.net>Wed Apr 04 00:19:29 2007 -0700
tree123d328a7225e8f118c68d1459bed82aaa01f7d5
parent2960a1d9eef846de9cfd9d6e32d203339d792120 [diff]
Fix twoway_merge that passed d/f conflict marker to merged_entry().

When switching from one tree to another, we should not send a
marker that says "this file does not exist in the new tree -- I
am a placeholder to tell you that, and not a real blob" down to
merged_entry() as the result of the merge.
1 file changed
tree: 123d328a7225e8f118c68d1459bed82aaa01f7d5
  1. arm/
  2. compat/
  3. contrib/
  4. Documentation/
  5. git-gui/
  6. gitweb/
  7. mozilla-sha1/
  8. perl/
  9. ppc/
  10. t/
  11. templates/
  12. xdiff/
  13. RelNotes ⇨ Documentation/RelNotes-1.5.1.txt
  14. .gitignore
  15. .mailmap
  16. alloc.c
  17. archive-tar.c
  18. archive-zip.c
  19. archive.h
  20. base85.c
  21. blob.c
  22. blob.h
  23. builtin-add.c
  24. builtin-annotate.c
  25. builtin-apply.c
  26. builtin-archive.c
  27. builtin-blame.c
  28. builtin-branch.c
  29. builtin-bundle.c
  30. builtin-cat-file.c
  31. builtin-check-ref-format.c
  32. builtin-checkout-index.c
  33. builtin-commit-tree.c
  34. builtin-config.c
  35. builtin-count-objects.c
  36. builtin-describe.c
  37. builtin-diff-files.c
  38. builtin-diff-index.c
  39. builtin-diff-tree.c
  40. builtin-diff.c
  41. builtin-fetch--tool.c
  42. builtin-fmt-merge-msg.c
  43. builtin-for-each-ref.c
  44. builtin-fsck.c
  45. builtin-gc.c
  46. builtin-grep.c
  47. builtin-init-db.c
  48. builtin-log.c
  49. builtin-ls-files.c
  50. builtin-ls-tree.c
  51. builtin-mailinfo.c
  52. builtin-mailsplit.c
  53. builtin-merge-base.c
  54. builtin-merge-file.c
  55. builtin-mv.c
  56. builtin-name-rev.c
  57. builtin-pack-objects.c
  58. builtin-pack-refs.c
  59. builtin-prune-packed.c
  60. builtin-prune.c
  61. builtin-push.c
  62. builtin-read-tree.c
  63. builtin-reflog.c
  64. builtin-rerere.c
  65. builtin-rev-list.c
  66. builtin-rev-parse.c
  67. builtin-revert.c
  68. builtin-rm.c
  69. builtin-runstatus.c
  70. builtin-shortlog.c
  71. builtin-show-branch.c
  72. builtin-show-ref.c
  73. builtin-stripspace.c
  74. builtin-symbolic-ref.c
  75. builtin-tar-tree.c
  76. builtin-unpack-objects.c
  77. builtin-update-index.c
  78. builtin-update-ref.c
  79. builtin-upload-archive.c
  80. builtin-verify-pack.c
  81. builtin-write-tree.c
  82. builtin.h
  83. cache-tree.c
  84. cache-tree.h
  85. cache.h
  86. check-builtins.sh
  87. check-racy.c
  88. color.c
  89. color.h
  90. combine-diff.c
  91. commit.c
  92. commit.h
  93. config.c
  94. config.mak.in
  95. configure.ac
  96. connect.c
  97. convert-objects.c
  98. convert.c
  99. copy.c
  100. COPYING
  101. csum-file.c
  102. csum-file.h
  103. ctype.c
  104. daemon.c
  105. date.c
  106. delta.h
  107. diff-delta.c
  108. diff-lib.c
  109. diff.c
  110. diff.h
  111. diffcore-break.c
  112. diffcore-delta.c
  113. diffcore-order.c
  114. diffcore-pickaxe.c
  115. diffcore-rename.c
  116. diffcore.h
  117. dir.c
  118. dir.h
  119. dump-cache-tree.c
  120. entry.c
  121. environment.c
  122. exec_cmd.c
  123. exec_cmd.h
  124. fast-import.c
  125. fetch-pack.c
  126. fetch.c
  127. fetch.h
  128. generate-cmdlist.sh
  129. git-add--interactive.perl
  130. git-am.sh
  131. git-applymbox.sh
  132. git-applypatch.sh
  133. git-archimport.perl
  134. git-bisect.sh
  135. git-checkout.sh
  136. git-clean.sh
  137. git-clone.sh
  138. git-commit.sh
  139. git-compat-util.h
  140. git-cvsexportcommit.perl
  141. git-cvsimport.perl
  142. git-cvsserver.perl
  143. git-fetch.sh
  144. git-instaweb.sh
  145. git-lost-found.sh
  146. git-ls-remote.sh
  147. git-merge-octopus.sh
  148. git-merge-one-file.sh
  149. git-merge-ours.sh
  150. git-merge-resolve.sh
  151. git-merge-stupid.sh
  152. git-merge.sh
  153. git-mergetool.sh
  154. git-p4import.py
  155. git-parse-remote.sh
  156. git-pull.sh
  157. git-quiltimport.sh
  158. git-rebase.sh
  159. git-relink.perl
  160. git-remote.perl
  161. git-repack.sh
  162. git-request-pull.sh
  163. git-reset.sh
  164. git-send-email.perl
  165. git-sh-setup.sh
  166. git-svn.perl
  167. git-svnimport.perl
  168. git-tag.sh
  169. git-verify-tag.sh
  170. GIT-VERSION-GEN
  171. git.c
  172. git.spec.in
  173. gitk
  174. grep.c
  175. grep.h
  176. hash-object.c
  177. help.c
  178. http-fetch.c
  179. http-push.c
  180. http.c
  181. http.h
  182. ident.c
  183. imap-send.c
  184. index-pack.c
  185. INSTALL
  186. interpolate.c
  187. interpolate.h
  188. list-objects.c
  189. list-objects.h
  190. local-fetch.c
  191. lockfile.c
  192. log-tree.c
  193. log-tree.h
  194. Makefile
  195. merge-file.c
  196. merge-index.c
  197. merge-recursive.c
  198. merge-tree.c
  199. mktag.c
  200. mktree.c
  201. object-refs.c
  202. object.c
  203. object.h
  204. pack-check.c
  205. pack-redundant.c
  206. pack.h
  207. pager.c
  208. patch-delta.c
  209. patch-id.c
  210. path-list.c
  211. path-list.h
  212. path.c
  213. peek-remote.c
  214. pkt-line.c
  215. pkt-line.h
  216. quote.c
  217. quote.h
  218. reachable.c
  219. reachable.h
  220. read-cache.c
  221. README
  222. receive-pack.c
  223. reflog-walk.c
  224. reflog-walk.h
  225. refs.c
  226. refs.h
  227. revision.c
  228. revision.h
  229. rsh.c
  230. rsh.h
  231. run-command.c
  232. run-command.h
  233. send-pack.c
  234. server-info.c
  235. setup.c
  236. sha1_file.c
  237. sha1_name.c
  238. shallow.c
  239. shell.c
  240. show-index.c
  241. sideband.c
  242. sideband.h
  243. ssh-fetch.c
  244. ssh-pull.c
  245. ssh-push.c
  246. ssh-upload.c
  247. strbuf.c
  248. strbuf.h
  249. tag.c
  250. tag.h
  251. tar.h
  252. test-chmtime.c
  253. test-date.c
  254. test-delta.c
  255. test-sha1.c
  256. test-sha1.sh
  257. trace.c
  258. tree-diff.c
  259. tree-walk.c
  260. tree-walk.h
  261. tree.c
  262. tree.h
  263. unpack-file.c
  264. unpack-trees.c
  265. unpack-trees.h
  266. update-server-info.c
  267. upload-pack.c
  268. usage.c
  269. utf8.c
  270. utf8.h
  271. var.c
  272. write_or_die.c
  273. wt-status.c
  274. wt-status.h
  275. xdiff-interface.c
  276. xdiff-interface.h