Re: [git-users] mergetool bug when merging ignored files from stash

2012-07-16 Thread Konstantin Khomoutov
On Mon, 16 Jul 2012 07:09:36 -0700 (PDT) sophana wrote: > I'm quite a git beginner. I'm still evaluating git with git-svn > v1.7.1 on rhel6. > I think I found a bug in git mergetool, but as I'm a beginner I'm not > sure. [...] > Hope this helps. Unfortunately, this list is for solving problems b

[git-users] mergetool bug when merging ignored files from stash

2012-07-16 Thread sophana
Hi I'm quite a git beginner. I'm still evaluating git with git-svn v1.7.1 on rhel6. I think I found a bug in git mergetool, but as I'm a beginner I'm not sure. Looking around, It looks that the bug is similar to the one reported here: http://git.661346.n2.nabble.com/BUG-mergetool-fails-on-gitig