Also use --3way to ease conflict resolutions. * etc/git/gitconfig [b4]: Add shazam-am-flags option. Change-Id: I6a92909a5b23a8680c16251aafa084b9a48944ea |
||
|---|---|---|
| .. | ||
| commit-msg | ||
| gitconfig | ||
| pre-push | ||
Also use --3way to ease conflict resolutions. * etc/git/gitconfig [b4]: Add shazam-am-flags option. Change-Id: I6a92909a5b23a8680c16251aafa084b9a48944ea |
||
|---|---|---|
| .. | ||
| commit-msg | ||
| gitconfig | ||
| pre-push | ||