dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-06-30 19:58:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/am-3-show-corrupted-patch'

Browse Source 
* jc/am-3-show-corrupted-patch:
  am -3: recover the diagnostic messages for corrupt patches
This commit is contained in:
Junio C Hamano
2010-05-21 04:02:18 -07:00
parent a660534e06 0ba17dd022
commit edea184a58
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git-am.sh
View File

@@ -740,7 +740,7 @@ do
;;
esac
if test $apply_status = 1 && test "$threeway" = t
if test $apply_status != 0 && test "$threeway" = t
then
if (fall_back_3way)
then