OSDN Git Service
(root)
/
git-core
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5adb374
32eaf1d
)
Merge branch 'ks/difftool-dir-diff-copy-fix'
author
Junio C Hamano
<gitster@pobox.com>
Thu, 6 Jun 2013 19:18:47 +0000
(12:18 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 6 Jun 2013 19:18:47 +0000
(12:18 -0700)
"difftool --dir-diff" did not copy back changes made by the
end-user in the diff tool backend to the working tree in some
cases.
* ks/difftool-dir-diff-copy-fix:
difftool --dir-diff: allow changing any clean working tree file
Trivial merge