projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7bdaf0b 0e1b501)
Merge branch 'jn/merge-custom-no-trivial'
authorJunio C Hamano <gitster@pobox.com>
Fri, 3 Sep 2010 16:43:43 +0000 (09:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 3 Sep 2010 16:43:43 +0000 (09:43 -0700)
commit460645a8c331196c3e5e61de4acf3f9c5803e335
treeea40e43d2d844ec5fd455d0ba41a3c67bb6bf390tree | snapshot
parent7bdaf0bd1cffde9b3d14762f67f22991e8e17ef6commit | diff
parent0e1b50152bfc12d2d286af17993f6356171e9ce5commit | diff
Merge branch 'jn/merge-custom-no-trivial'

* jn/merge-custom-no-trivial:
  t7606: Avoid using head as a file name
  merge: let custom strategies intervene in trivial merges
  t7606 (merge-theirs): modernize style
builtin/merge.c diff1 | diff2 | blob | history
Git—the stupid content tracker