Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'al/mergetool-printf-fix'
author
Junio C Hamano
<gitster@pobox.com>
Thu, 14 Feb 2013 18:29:37 +0000
(10:29 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 14 Feb 2013 18:29:37 +0000
(10:29 -0800)
* al/mergetool-printf-fix:
difftool--helper: fix printf usage
git-mergetool: print filename when it contains %
1
2
git-mergetool.sh
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
393b7c3
2a9ccff
)
diff --cc
git-mergetool.sh
Simple merge