mergetool feature request - select remote or local

[Caleb Cushing <xenoterracide@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 860 bytes --]

sometimes when merge-ing fast forward doesn't work. but you know what the 
resolution you want is.

example (current behavior)
Normal merge conflict for 'css/main.css':
  {local}: modified
  {remote}: modified
Hit return to start merge resolution tool (vimdiff):

but I don't want to. I know the remote updates are right. I could do a git 
checkout remotebranch filename but when you have 20 files that need updating 
this is annoying

my suggestion is this
Normal merge conflict for 'css/main.css':
  {local}: modified
  {remote}: modified
Use (l)local or (r)remote or (m)anual? 

also in the event of having 20 files with this issue it would be nice to have 
an option after first starting mergetool for remote all or local all.

(note: I am not subscribed to the list)
-- 
Caleb Cushing

my blog http://xenoterracide.blogspot.com

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 197 bytes --]